Bug 298306: For new products, the charting error message "The tool which gathers...

diff --git a/reports.cgi b/reports.cgi
index 49948e2bb23294d685529a03d151990474b5182a..7274ea8e2b221d08c52a038b92c676c7e4b5baeb 100755 (executable)
--- a/reports.cgi
+++ b/reports.cgi
@@ -253,7 +253,11 @@ sub generate_chart {
     my ($data_file, $image_file, $type, $product, $datasets) = @_;
     
     if (! open FILE, $data_file) {
-        ThrowCodeError("chart_data_not_generated");
+        if ($product eq '-All-') {
+            $product = '';
+        }
+
+        ThrowCodeError("chart_data_not_generated", {'product' => $product});
     }
 
     my @fields;

diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index f11b27b0a78d5f5e1784eee899c088583456144f..b459fa44a3001f4eb8a57d8fd2ce218c85b78f49 100644 (file)
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -70,8 +70,18 @@
     the error [% bug.error FILTER html %].
     
   [% ELSIF error == "chart_data_not_generated" %]
-    The tool which gathers [% terms.bug %] counts has not been run yet.
-        
+    [% IF product %]
+      Charts for the <em>[% product FILTER html %]</em> product are not
+      available yet because no charting data has been collected for it since it
+      was created.
+    [% ELSE %]
+      No charting data has been collected yet.
+    [% END %]
+    Please wait a day and try again.
+    If you're seeing this message after a day, then you should contact
+    <a href="mailto:[% Param('maintainer') %]">[% Param('maintainer') %]</a>
+    and reference this error.
+
   [% ELSIF error == "chart_datafile_corrupt" %]
     The chart data file [% file FILTER html %] is corrupt.