jro_apps/redmine Commit - r2991:66540afc0820

Adds dynamic columns selection on the issue list (#4272)....

Jean-Philippe Lang -

r2991:66540afc0820

parent child

Context file:

r2991:66540afc0820

Collapse all files

app/controllers/issues_controller.rb +3 -2

                       end
                     end
                     @query.group_by = params[:group_by]
-                    session[:query] = {:project_id => @query.project_id, :filters => @query.filters, :group_by => @query.group_by}
+                    @query.column_names = params[:query] && params[:query][:column_names]
+                    session[:query] = {:project_id => @query.project_id, :filters => @query.filters, :group_by => @query.group_by, :column_names => @query.column_names}
                   else
                     @query = Query.find_by_id(session[:query][:id]) if session[:query][:id]
-                    @query ||= Query.new(:name => "_", :project => @project, :filters => session[:query][:filters], :group_by => session[:query][:group_by])
+                    @query ||= Query.new(:name => "_", :project => @project, :filters => session[:query][:filters], :group_by => session[:query][:group_by], :column_names => session[:query][:column_names])
                     @query.project = @project
                   end
                 end

app/models/query.rb +8 -2

               end
               def column_names=(names)
-                names = names.select {|n| n.is_a?(Symbol) || !n.blank? } if names
+                if names
-                names = names.collect {|n| n.is_a?(Symbol) ? n : n.to_sym } if names
+                  names = names.select {|n| n.is_a?(Symbol) || !n.blank? }
+                  names = names.collect {|n| n.is_a?(Symbol) ? n : n.to_sym }
+                  # Set column_names to nil if default columns
+                  if names.map(&:to_s) == Setting.issue_list_default_columns
+                    names = nil
+                  end
+                end
                 write_attribute(:column_names, names)
               end

app/views/issues/index.rhtml +12 -3

                 <fieldset class="collapsible collapsed">
                 	<legend onclick="toggleFieldset(this);"><%= l(:label_options) %></legend>
                 	<div style="display: none;">
-            				<%= l(:field_group_by) %>
+                		<table>
-            				<%= select_tag('group_by', options_for_select([[]] + @query.groupable_columns.collect {|c| [c.caption, c.name.to_s]}, @query.group_by)) %>
+                			<tr>
+                				<td><%= l(:field_column_names) %></td>
+            						<td><%= render :partial => 'queries/columns', :locals => {:query => @query} %></td>
+            					</tr>
+            					<tr>
+            						<td><%= l(:field_group_by) %></td>
+            						<td><%= select_tag('group_by', options_for_select([[]] + @query.groupable_columns.collect {|c| [c.caption, c.name.to_s]}, @query.group_by)) %></td>
+            					</tr>
+            				</table>
             			</div>
             		</fieldset>
             		</div>
                 <%= link_to_remote l(:button_apply),
                                    { :url => { :set_filter => 1 },
+                                     :before => 'selectAllOptions("selected_columns");',
                                      :update => "content",
                                      :with => "Form.serialize('query_form')"
                                    }, :class => 'icon icon-checked' %>
                                    }, :class => 'icon icon-reload'  %>
                 <% if @query.new_record? && User.current.allowed_to?(:save_queries, @project, :global => true) %>
-                <%= link_to l(:button_save), {}, :onclick => "$('query_form').submit(); return false;", :class => 'icon icon-save' %>
+                <%= link_to l(:button_save), {}, :onclick => "selectAllOptions('selected_columns'); $('query_form').submit(); return false;", :class => 'icon icon-save' %>
                 <% end %>
                 </p>
             <% end %>

app/views/queries/_columns.rhtml +3 -8

-            <% content_tag 'fieldset', :id => 'columns', :style => (query.has_default_columns? ? 'display:none;' : nil) do %>
+            <table style="border-collapse: collapse; border:0;">
-            <legend><%= l(:field_column_names) %></legend>
-            <%= hidden_field_tag 'query[column_names][]', '', :id => nil %>
-            <table>
             	<tr>
-            		<td><%= select_tag 'available_columns',
+            		<td style="padding-left:0"><%= select_tag 'available_columns',
             		          options_for_select((query.available_columns - query.columns).collect {|column| [column.caption, column.name]}),
             		          :multiple => true, :size => 10, :style => "width:150px" %>
             		</td>
             			 onclick="moveOptions(this.form.selected_columns, this.form.available_columns);" />
             		</td>
             		<td><%= select_tag 'query[column_names][]',
-            		          options_for_select(@query.columns.collect {|column| [column.caption, column.name]}),
+            		          options_for_select(query.columns.collect {|column| [column.caption, column.name]}),
             		          :id => 'selected_columns', :multiple => true, :size => 10, :style => "width:150px" %>
             		</td>
             	</tr>
             </table>
-            <% end %>
             <% content_for :header_tags do %>
             <%= javascript_include_tag 'select_list_move' %>

app/views/queries/_form.rhtml +4 0

             <% end %>
             </fieldset>
+            <% content_tag 'fieldset', :id => 'columns', :style => (query.has_default_columns? ? 'display:none;' : nil) do %>
+            <legend><%= l(:field_column_names) %></legend>
             <%= render :partial => 'queries/columns', :locals => {:query => query}%>
+            <% end %>
             </div>

test/functional/issues_controller_test.rb +16 0

@@ -255,6 +255,22 class IssuesControllerTest < ActionController::TestCase
255	assert !issues.empty?	255	assert !issues.empty?
256	assert_equal issues.sort {\|a,b\| a.tracker == b.tracker ? b.id <=> a.id : a.tracker <=> b.tracker }.collect(&:id), issues.collect(&:id)	256	assert_equal issues.sort {\|a,b\| a.tracker == b.tracker ? b.id <=> a.id : a.tracker <=> b.tracker }.collect(&:id), issues.collect(&:id)
257	end	257	end
		258
		259	def test_index_with_columns
		260	columns = ['tracker', 'subject', 'assigned_to']
		261	get :index, :set_filter => 1, :query => { 'column_names' => columns}
		262	assert_response :success
		263
		264	# query should use specified columns
		265	query = assigns(:query)
		266	assert_kind_of Query, query
		267	assert_equal columns, query.column_names.map(&:to_s)
		268
		269	# columns should be stored in session
		270	assert_kind_of Hash, session[:query]
		271	assert_kind_of Array, session[:query][:column_names]
		272	assert_equal columns, session[:query][:column_names].map(&:to_s)
		273	end
258		274
259	def test_gantt	275	def test_gantt
260	get :gantt, :project_id => 1	276	get :gantt, :project_id => 1

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages