jro_apps/redmine Commit - r8704:5e0c1cc5ce9e

Bulk-edit custom fields through context menu (#6296)....

Jean-Philippe Lang -

r8704:5e0c1cc5ce9e

parent child

Context file:

r8704:5e0c1cc5ce9e

Collapse all files

app/controllers/context_menus_controller.rb +13 0

@@ -42,6 +42,19 class ContextMenusController < ApplicationController
42	@statuses = IssueStatus.find(:all, :order => 'position')	42	@statuses = IssueStatus.find(:all, :order => 'position')
43	@back = back_url	43	@back = back_url
44		44
		45	@options_by_custom_field = {}
		46	if @can[:edit]
		47	custom_fields = @issues.map(&:available_custom_fields).inject {\|memo, f\| memo & f}.select do \|f\|
		48	%w(bool list user version).include?(f.field_format) && !f.multiple?
		49	end
		50	custom_fields.each do \|field\|
		51	values = field.possible_values_options(@projects)
		52	if values.any?
		53	@options_by_custom_field[field] = values
		54	end
		55	end
		56	end
		57
45	render :layout => false	58	render :layout => false
46	end	59	end
47		60

app/helpers/context_menus_helper.rb +7 0

@@ -33,4 +33,11 module ContextMenusHelper
33	end	33	end
34	link_to h(name), url, options	34	link_to h(name), url, options
35	end	35	end
		36
		37	def bulk_update_custom_field_context_menu_link(field, text, value)
		38	context_menu_link h(text),
		39	{:controller => 'issues', :action => 'bulk_update', :ids => @issues.collect(&:id), :issue => {'custom_field_values' => {field.id => value}}, :back_url => @back},
		40	:method => :post,
		41	:selected => (@issue && @issue.custom_field_value(field) == value)
		42	end
36	end	43	end

app/models/custom_field.rb +5 -1

                   else
                     []
                   end
+                when 'bool'
+                  [[l(:general_text_Yes), '1'], [l(:general_text_No), '0']]
                 else
-                  read_attribute :possible_values
+                  read_attribute(:possible_values) || []
                 end
               end
                 case field_format
                 when 'user', 'version'
                   possible_values_options(obj).collect(&:last)
+                when 'bool'
+                  ['1', '0']
                 else
                   read_attribute :possible_values
                 end

app/views/context_menus/issues.html.erb +14 0

@@ -100,6 +100,20
100	</li>	100	</li>
101	<% end %>	101	<% end %>
102		102
		103	<% @options_by_custom_field.each do \|field, options\| %>
		104	<li class="folder">
		105	<a href="#" class="submenu"><%= h(field.name) %></a>
		106	<ul>
		107	<% options.each do \|text, value\| %>
		108	<li><%= bulk_update_custom_field_context_menu_link(field, text, value \|\| text) %></li>
		109	<% end %>
		110	<% unless field.is_required? %>
		111	<li><%= bulk_update_custom_field_context_menu_link(field, l(:label_none), '') %></li>
		112	<% end %>
		113	</ul>
		114	</li>
		115	<% end %>
		116
103	<% if !@issue.nil? %>	117	<% if !@issue.nil? %>
104	<% if @can[:log_time] -%>	118	<% if @can[:log_time] -%>
105	<li><%= context_menu_link l(:button_log_time), {:controller => 'timelog', :action => 'new', :issue_id => @issue},	119	<li><%= context_menu_link l(:button_log_time), {:controller => 'timelog', :action => 'new', :issue_id => @issue},

public/stylesheets/context_menu.css +1 -1

             }
             #context-menu li>a { width:auto; } /* others */
             #context-menu a.disabled, #context-menu a.disabled:hover {color: #ccc;}
-            #context-menu li a.submenu { background:url("../images/bullet_arrow_right.png") right no-repeat; }
+            #context-menu li a.submenu { padding-right:16px; background:url("../images/bullet_arrow_right.png") right no-repeat; }
             #context-menu li:hover { border:1px solid gray; background-color:#eee; }
             #context-menu a:hover {color:#2A5685;}
             #context-menu li.folder:hover { z-index:40; }

test/functional/context_menus_controller_test.rb +96 0

@@ -117,6 +117,102 class ContextMenusControllerTest < ActionController::TestCase
117	:class => 'icon-del' }	117	:class => 'icon-del' }
118	end	118	end
119		119
		120	def test_context_menu_should_include_list_custom_fields
		121	field = IssueCustomField.create!(:name => 'List', :field_format => 'list',
		122	:possible_values => ['Foo', 'Bar'], :is_for_all => true, :tracker_ids => [1, 2, 3])
		123	@request.session[:user_id] = 2
		124	get :issues, :ids => [1, 2]
		125
		126	assert_tag 'a',
		127	:content => 'List',
		128	:attributes => {:href => '#'},
		129	:sibling => {:tag => 'ul', :children => {:count => 3}}
		130
		131	assert_tag 'a',
		132	:content => 'Foo',
		133	:attributes => {:href => "/issues/bulk_update?ids%5B%5D=1&ids%5B%5D=2&issue%5Bcustom_field_values%5D%5B#{field.id}%5D=Foo"}
		134	assert_tag 'a',
		135	:content => 'none',
		136	:attributes => {:href => "/issues/bulk_update?ids%5B%5D=1&ids%5B%5D=2&issue%5Bcustom_field_values%5D%5B#{field.id}%5D="}
		137	end
		138
		139	def test_context_menu_should_not_include_null_value_for_required_custom_fields
		140	field = IssueCustomField.create!(:name => 'List', :is_required => true, :field_format => 'list',
		141	:possible_values => ['Foo', 'Bar'], :is_for_all => true, :tracker_ids => [1, 2, 3])
		142	@request.session[:user_id] = 2
		143	get :issues, :ids => [1, 2]
		144
		145	assert_tag 'a',
		146	:content => 'List',
		147	:attributes => {:href => '#'},
		148	:sibling => {:tag => 'ul', :children => {:count => 2}}
		149	end
		150
		151	def test_context_menu_on_single_issue_should_select_current_custom_field_value
		152	field = IssueCustomField.create!(:name => 'List', :field_format => 'list',
		153	:possible_values => ['Foo', 'Bar'], :is_for_all => true, :tracker_ids => [1, 2, 3])
		154	issue = Issue.find(1)
		155	issue.custom_field_values = {field.id => 'Bar'}
		156	issue.save!
		157	@request.session[:user_id] = 2
		158	get :issues, :ids => [1]
		159
		160	assert_tag 'a',
		161	:content => 'List',
		162	:attributes => {:href => '#'},
		163	:sibling => {:tag => 'ul', :children => {:count => 3}}
		164	assert_tag 'a',
		165	:content => 'Bar',
		166	:attributes => {:class => /icon-checked/}
		167	end
		168
		169	def test_context_menu_should_include_bool_custom_fields
		170	field = IssueCustomField.create!(:name => 'Bool', :field_format => 'bool',
		171	:is_for_all => true, :tracker_ids => [1, 2, 3])
		172	@request.session[:user_id] = 2
		173	get :issues, :ids => [1, 2]
		174
		175	assert_tag 'a',
		176	:content => 'Bool',
		177	:attributes => {:href => '#'},
		178	:sibling => {:tag => 'ul', :children => {:count => 3}}
		179
		180	assert_tag 'a',
		181	:content => 'Yes',
		182	:attributes => {:href => "/issues/bulk_update?ids%5B%5D=1&ids%5B%5D=2&issue%5Bcustom_field_values%5D%5B#{field.id}%5D=1"}
		183	end
		184
		185	def test_context_menu_should_include_user_custom_fields
		186	field = IssueCustomField.create!(:name => 'User', :field_format => 'user',
		187	:is_for_all => true, :tracker_ids => [1, 2, 3])
		188	@request.session[:user_id] = 2
		189	get :issues, :ids => [1, 2]
		190
		191	assert_tag 'a',
		192	:content => 'User',
		193	:attributes => {:href => '#'},
		194	:sibling => {:tag => 'ul', :children => {:count => Project.find(1).members.count + 1}}
		195
		196	assert_tag 'a',
		197	:content => 'John Smith',
		198	:attributes => {:href => "/issues/bulk_update?ids%5B%5D=1&ids%5B%5D=2&issue%5Bcustom_field_values%5D%5B#{field.id}%5D=2"}
		199	end
		200
		201	def test_context_menu_should_include_version_custom_fields
		202	field = IssueCustomField.create!(:name => 'Version', :field_format => 'version', :is_for_all => true, :tracker_ids => [1, 2, 3])
		203	@request.session[:user_id] = 2
		204	get :issues, :ids => [1, 2]
		205
		206	assert_tag 'a',
		207	:content => 'Version',
		208	:attributes => {:href => '#'},
		209	:sibling => {:tag => 'ul', :children => {:count => Project.find(1).shared_versions.count + 1}}
		210
		211	assert_tag 'a',
		212	:content => '2.0',
		213	:attributes => {:href => "/issues/bulk_update?ids%5B%5D=1&ids%5B%5D=2&issue%5Bcustom_field_values%5D%5B#{field.id}%5D=3"}
		214	end
		215
120	def test_context_menu_by_assignable_user_should_include_assigned_to_me_link	216	def test_context_menu_by_assignable_user_should_include_assigned_to_me_link
121	@request.session[:user_id] = 2	217	@request.session[:user_id] = 2
122	get :issues, :ids => [1]	218	get :issues, :ids => [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