# HG changeset patch
# User olivier
# Date 1456841955 -3600
#      Tue Mar 01 15:19:15 2016 +0100
# Branch 3.2-stable
# Node ID bce05ff78e481f1e0d842d22e5d76c78dbed9702
# Parent  bfee156714b9773e4015ce245418a1ff5250ffb5
Fix suggestion for not showing any totalable column when
global options indicate some but the user deselected all

diff -r bfee156714b9 -r bce05ff78e48 app/helpers/queries_helper.rb
--- a/app/helpers/queries_helper.rb	Sat Jan 30 13:32:54 2016 +0000
+++ b/app/helpers/queries_helper.rb	Tue Mar 01 15:19:15 2016 +0100
@@ -87,7 +87,7 @@
   def available_totalable_columns_tags(query)
     tags = ''.html_safe
     query.available_totalable_columns.each do |column|
-      tags << content_tag('label', check_box_tag('t[]', column.name.to_s, query.totalable_columns.include?(column), :id => nil) + " #{column.caption}", :class => 'inline')
+      tags << content_tag('label', check_box_tag('t[]', column.name.to_s, query.totalable_columns.include?(column), :id => nil) + " #{column.caption}", :class => 'inline', :onchange => 'document.getElementById(\'include_totals\').value=$(\'input[name="t[]"]\').is(\':checked\');')
     end
     tags
   end
diff -r bfee156714b9 -r bce05ff78e48 app/models/query.rb
--- a/app/models/query.rb	Sat Jan 30 13:32:54 2016 +0000
+++ b/app/models/query.rb	Tue Mar 01 15:19:15 2016 +0100
@@ -250,6 +250,7 @@
     end
     self.group_by = params[:group_by] || (params[:query] && params[:query][:group_by])
     self.column_names = params[:c] || (params[:query] && params[:query][:column_names])
+    options[:include_totals] = params[:include_totals].present? ? params[:include_totals].match(/false/).nil? : true
     self.totalable_names = params[:t] || (params[:query] && params[:query][:totalable_names])
     self
   end
@@ -511,6 +512,7 @@
   end
 
   def totalable_names
+    options[:include_totals] = true unless !options[:include_totals].nil?
     options[:totalable_names] || Setting.issue_list_default_totals.map(&:to_sym) || []
   end
 
diff -r bfee156714b9 -r bce05ff78e48 app/views/issues/index.html.erb
--- a/app/views/issues/index.html.erb	Sat Jan 30 13:32:54 2016 +0000
+++ b/app/views/issues/index.html.erb	Tue Mar 01 15:19:15 2016 +0100
@@ -42,6 +42,7 @@
           <tr>
             <td><%= l(:label_total_plural) %></td>
             <td><%= available_totalable_columns_tags(@query) %></td>
+            <%= hidden_field_tag('include_totals', params[:include_totals]) %></td>
           </tr>
         </table>
       </div>