Bug 520948: Use Bugzilla->feature and feature_enabled everywhere instead of checking if modules are installed

Patch by Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit, a=LpSolit

3 files changed, 34 insertions, 50 deletions

diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index 8ad0c4ae9..3c9f73f4c 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -110,11 +110,6 @@
   [% ELSIF error == "chart_file_open_fail" %]
     Unable to open the chart datafile <tt>[% filename FILTER html %]</tt>.
   
-  [% ELSIF error == "chart_lines_not_installed" %]
-    [% admindocslinks = {'installation.html#install-perlmodules' => 'Installing Perl modules necessary for Charting'} %]
-    Charts will not work without the Chart::Lines Perl module being installed.
-    Run checksetup.pl for installation instructions.
-
   [% ELSIF error == "column_not_null_without_default" %]
     Failed adding the column [% name FILTER html %]:
     You cannot add a NOT NULL column with no default to an existing table
@@ -167,11 +162,6 @@
     '[% field.description FILTER html %]' ([% field.name FILTER html %])
     is not a custom field.
 
-  [% ELSIF error == "gd_not_installed" %]
-    [% admindocslinks = {'installation.html#install-perlmodules' => 'Installing Perl modules necessary for Charting'} %]
-    Charts will not work without the GD Perl module being installed.
-    Run checksetup.pl for installation instructions.
-
   [% ELSIF error == "illegal_content_type_method" %]
     Your form submission got corrupted somehow.  The <em>content
     method</em> field, which specifies how the content type gets determined,
@@ -228,6 +218,15 @@
     but you tried to flag it as obsolete while creating a new attachment to 
     [% terms.bug %] [%+ my_bug_id FILTER html %].
 
+  [% ELSIF error == "feature_disabled" %]
+    The [% install_string("feature_$feature") FILTER html %] feature is not
+    available in this [% terms.Bugzilla %]. 
+    [% IF user.in_group('admin') %]
+      If you would like to enable this feature, please run 
+      <kbd>checksetup.pl</kbd> to see how to install the necessary
+      requirements for this feature.
+    [% END %]
+
   [% ELSIF error == "flag_unexpected_object" %]
     [% title = "Object Not Recognized" %]
     Flags cannot be set for objects of type [% caller FILTER html %].
@@ -280,23 +279,11 @@
     Inserting a <code>[% job FILTER html %]</code> job into the Job 
     Queue failed with the following error: [% errmsg FILTER html %]
 
-  [% ELSIF error == "jobqueue_not_configured" %]
-    Using the job queue system requires that certain Perl modules
-    be installed. Run <code>checksetup.pl</code> to see what modules
-    you are missing.
-
   [% ELSIF error == "jobqueue_no_job_mapping" %]
     <code>Bugzilla::JobQueue</code> has not been configured to handle
     the job "[% job FILTER html %]".  You need to add this job type
     to the <code>JOB_MAP</code> constant in <code>Bugzilla::JobQueue</code>.
 
-  [% ELSIF error == "json_rpc_not_installed" %]
-   [% admindocslinks = { 'installation.html#install-perlmodules' 
-                         => 'Installing Perl modules' } %]
-    The JSON-RPC interface will not work without the <code>JSON::RPC</code>
-    Perl module being installed. Run <code>checksetup.pl</code> for
-    installation instructions. 
-
   [% ELSIF error == "ldap_bind_failed" %]
     Failed to bind to the LDAP server. The error message was: 
     <code>[% errstr FILTER html %]</code>
@@ -426,12 +413,6 @@
     The value "<code>[% value FILTER html %]</code>" is not in the list of
     legal values for the <em>[% name FILTER html %]</em> setting.
 
-  [% ELSIF error == "soap_not_installed" %]
-    [% admindocslinks = {'installation.html#install-perlmodules' => 'Installing Perl modules'} %]
-    The XMLRPC interface will not work without the SOAP::Lite Perl module being
-    installed.
-    Run checksetup.pl for installation instructions.
-
   [% ELSIF error == "token_generation_error" %]
     Something is seriously wrong with the token generation system.
 
diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl
index 6231baa43..dd00d3550 100644
--- a/template/en/default/index.html.tmpl
+++ b/template/en/default/index.html.tmpl
@@ -97,9 +97,6 @@ YAHOO.util.Event.onDOMReady(onLoadActions);
       <p class="notice">This message is only shown to logged in users with admin privs.
       You can configure this notification from the
       <a href="editparams.cgi?section=core#upgrade_notification">Parameters</a> page.</p>
-    [% ELSIF release.error == "missing_package" %]
-      <p>Missing package '[% release.package FILTER html %]'. This package is required to
-      <a href="editparams.cgi?section=core#upgrade_notification">notify you about new releases</a>.</p>
     [% ELSIF release.error == "cannot_download" %]
       <p>The local XML file '[% release.xml_file FILTER html %]' cannot be created.
       Please make sure the web server can write in this directory and that you can access
diff --git a/template/en/default/reports/menu.html.tmpl b/template/en/default/reports/menu.html.tmpl
index db5b19293..f7613ec01 100644
--- a/template/en/default/reports/menu.html.tmpl
+++ b/template/en/default/reports/menu.html.tmpl
@@ -48,28 +48,34 @@
     </strong> -
     tables of [% terms.bug %] counts in 1, 2 or 3 dimensions, as HTML or CSV.
   </li>
-  <li>
-    <strong>
-      <a href="query.cgi?format=report-graph">Graphical reports</a>
-    </strong> -
-    line graphs, bar and pie charts.
-  </li>
-</ul>
-
-<h2>Change Over Time</h2>
-
-<ul>
-  <li>
-    <strong><a href="reports.cgi">Old Charts</a></strong> - 
-    plot the status and/or resolution of [% terms.bugs %] against
-    time, for each product in your database.
-  </li>
-  [% IF user.in_group(Param("chartgroup")) %]
+  [% IF feature_enabled('graphical_reports') %]
     <li>
-      <strong><a href="chart.cgi">New Charts</a></strong> - 
-      plot any arbitrary search against time. Far more powerful.
+      <strong>
+        <a href="query.cgi?format=report-graph">Graphical reports</a>
+      </strong> -
+      line graphs, bar and pie charts.
     </li>
   [% END %]
 </ul>
 
+[% IF feature_enabled('new_charts') OR feature_enabled('old_charts') %]
+  <h2>Change Over Time</h2>
+
+  <ul>
+    [% IF feature_enabled('old_charts') %]
+      <li>
+        <strong><a href="reports.cgi">Old Charts</a></strong> - 
+        plot the status and/or resolution of [% terms.bugs %] against
+        time, for each product in your database.
+      </li>
+    [% END %]
+    [% IF feature_enabled('new_charts') AND user.in_group(Param("chartgroup")) %]
+      <li>
+        <strong><a href="chart.cgi">New Charts</a></strong> - 
+        plot any arbitrary search against time. Far more powerful.
+      </li>
+    [% END %]
+  </ul>
+[% END %]
+
 [% PROCESS global/footer.html.tmpl %]