Bug 1232716: Tabular reports with no column selected are not sortable

r=dkl

diff --git a/template/en/default/reports/report-table.html.tmpl b/template/en/default/reports/report-table.html.tmpl
index 03f3147dfe4abec02010fbb97e5e7a9f0eb5ce64..9027efa73a7d4e276f452359d40fb0e36826f0c6 100644 (file)
--- a/template/en/default/reports/report-table.html.tmpl
+++ b/template/en/default/reports/report-table.html.tmpl
@@ -37,18 +37,21 @@
 [% total_key = '-total-' %]
 [%# Most of these classes are defined in the DataTables plugin itself. %]
 <table id="tabular_report_[% table_id FILTER html %]" class="tabular_report display cell-border compact">
-  [% IF col_field %]
-    <thead>
+  <thead>
     <tr>
-      <th>&darr;&nbsp;[% row_field_disp FILTER html %] \ [% col_field_disp FILTER html %]&nbsp;&rarr;</th>
+      <th>
+        [% IF col_field %]
+          &darr;&nbsp;[% row_field_disp FILTER html %] \ [% col_field_disp FILTER html %]&nbsp;&rarr;
+        [% ELSE %]
+          [% row_field_disp FILTER html %]
+        [% END %]
+      </th>
       [% FOREACH col = col_names %]
-        [% NEXT IF col == "" %]
         <th>[% PROCESS value_display value = col field = col_field %]</th>
       [% END %]
       <th class="ttotal">Total</th>
     </tr>
-    </thead>
-  [% END %]
+  </thead>
   <tbody>
   [% FOREACH row = row_names %]
     <tr>