jro_apps/redmine Commit - r1279:d37a30846f2c

Fixed: when bulk editing, setting "Assigned to" to "nobody" causes an sql error with Postgresql (#935)....

Jean-Philippe Lang -

r1279:d37a30846f2c

parent child

Context file:

r1279:d37a30846f2c

Collapse all files

app/controllers/issues_controller.rb +5 -5

                 if request.post?
                   status = params[:status_id].blank? ? nil : IssueStatus.find_by_id(params[:status_id])
                   priority = params[:priority_id].blank? ? nil : Enumeration.find_by_id(params[:priority_id])
-                  assigned_to = params[:assigned_to_id].blank? ? nil : User.find_by_id(params[:assigned_to_id])
+                  assigned_to = (params[:assigned_to_id].blank? || params[:assigned_to_id] == 'none') ? nil : User.find_by_id(params[:assigned_to_id])
-                  category = params[:category_id].blank? ? nil : @project.issue_categories.find_by_id(params[:category_id])
+                  category = (params[:category_id].blank? || params[:category_id] == 'none') ? nil : @project.issue_categories.find_by_id(params[:category_id])
-                  fixed_version = params[:fixed_version_id].blank? ? nil : @project.versions.find_by_id(params[:fixed_version_id])
+                  fixed_version = (params[:fixed_version_id].blank? || params[:fixed_version_id] == 'none') ? nil : @project.versions.find_by_id(params[:fixed_version_id])
                   unsaved_issue_ids = []
                   @issues.each do |issue|
                     journal = issue.init_journal(User.current, params[:notes])
                     issue.priority = priority if priority
                     issue.assigned_to = assigned_to if assigned_to || params[:assigned_to_id] == 'none'
-                    issue.category = category if category
+                    issue.category = category if category || params[:category_id] == 'none'
-                    issue.fixed_version = fixed_version if fixed_version
+                    issue.fixed_version = fixed_version if fixed_version || params[:fixed_version_id] == 'none'
                     issue.start_date = params[:start_date] unless params[:start_date].blank?
                     issue.due_date = params[:due_date] unless params[:due_date].blank?
                     issue.done_ratio = params[:done_ratio] unless params[:done_ratio].blank?

app/views/issues/bulk_edit.rhtml +6 -2

             <label><%= l(:field_priority) %>:
             <%= select_tag('priority_id', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(Enumeration.get_values('IPRI'), :id, :name)) %></label>
             <label><%= l(:field_category) %>:
-            <%= select_tag('category_id', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@project.issue_categories, :id, :name)) %></label>
+            <%= select_tag('category_id', content_tag('option', l(:label_no_change_option), :value => '') +
+                                            content_tag('option', l(:label_none), :value => 'none') +
+                                            options_from_collection_for_select(@project.issue_categories, :id, :name)) %></label>
             </p>
             <p>
             <label><%= l(:field_assigned_to) %>:
                                              content_tag('option', l(:label_nobody), :value => 'none') +
                                              options_from_collection_for_select(@project.assignable_users, :id, :name)) %></label>
             <label><%= l(:field_fixed_version) %>:
-            <%= select_tag('fixed_version_id', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@project.versions, :id, :name)) %></label>
+            <%= select_tag('fixed_version_id', content_tag('option', l(:label_no_change_option), :value => '') +
+                                               content_tag('option', l(:label_none), :value => 'none') +
+                                               options_from_collection_for_select(@project.versions, :id, :name)) %></label>
             </p>
             <p>

test/functional/issues_controller_test.rb +10 0

@@ -339,6 +339,16 class IssuesControllerTest < Test::Unit::TestCase
339	assert_equal 'Bulk editing', Issue.find(1).journals.find(:first, :order => 'created_on DESC').notes	339	assert_equal 'Bulk editing', Issue.find(1).journals.find(:first, :order => 'created_on DESC').notes
340	end	340	end
341		341
		342	def test_bulk_unassign
		343	assert_not_nil Issue.find(2).assigned_to
		344	@request.session[:user_id] = 2
		345	# unassign issues
		346	post :bulk_edit, :ids => [1, 2], :notes => 'Bulk unassigning', :assigned_to_id => 'none'
		347	assert_response 302
		348	# check that the issues were updated
		349	assert_nil Issue.find(2).assigned_to
		350	end
		351
342	def test_move_one_issue_to_another_project	352	def test_move_one_issue_to_another_project
343	@request.session[:user_id] = 1	353	@request.session[:user_id] = 1
344	post :move, :id => 1, :new_project_id => 2	354	post :move, :id => 1, :new_project_id => 2

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