jro_apps/redmine Commit - r14849:fdc0782be1d6

Merged r15223 and r15225 (#22127)....

Jean-Philippe Lang -

r14849:fdc0782be1d6

parent child

Context file:

r14849:fdc0782be1d6

Collapse all files

app/models/issue.rb +11 0

@@ -470,6 +470,17 class Issue < ActiveRecord::Base
470	self.status_id = s	470	self.status_id = s
471	end	471	end
472	end	472	end
		473	if (u = attrs.delete('assigned_to_id')) && safe_attribute?('assigned_to_id')
		474	if u.blank?
		475	self.assigned_to_id = nil
		476	else
		477	u = u.to_i
		478	if assignable_users.any?{\|assignable_user\| assignable_user.id == u}
		479	self.assigned_to_id = u
		480	end
		481	end
		482	end
		483
473		484
474	attrs = delete_unsafe_attributes(attrs, user)	485	attrs = delete_unsafe_attributes(attrs, user)
475	return if attrs.empty?	486	return if attrs.empty?

test/functional/issues_controller_test.rb +4 -2

                 @request.session[:user_id] = 2
                 # update issues assignee
+                with_settings :issue_group_assignment => '1' do
                   post :bulk_update, :ids => [1, 2], :notes => 'Bulk editing',
                                                    :issue => {:priority_id => '',
                                                               :assigned_to_id => group.id,
                   assert_response 302
                   assert_equal [group, group], Issue.where(:id => [1, 2]).collect {|i| i.assigned_to}
                 end
+              end
               def test_bulk_update_on_different_projects
                 @request.session[:user_id] = 2
                   assert_no_difference 'Project.find(1).issues.count' do
                     post :bulk_update, :ids => [1, 2], :copy => '1',
                          :issue => {
-                           :project_id => '2', :tracker_id => '', :assigned_to_id => '4',
+                           :project_id => '2', :tracker_id => '', :assigned_to_id => '2',
                            :status_id => '1', :start_date => '2009-12-01', :due_date => '2009-12-31'
                          }
                   end
                 assert_equal 2, copied_issues.size
                 copied_issues.each do |issue|
                   assert_equal 2, issue.project_id, "Project is incorrect"
-                  assert_equal 4, issue.assigned_to_id, "Assigned to is incorrect"
+                  assert_equal 2, issue.assigned_to_id, "Assigned to is incorrect"
                   assert_equal 1, issue.status_id, "Status is incorrect"
                   assert_equal '2009-12-01', issue.start_date.to_s, "Start date is incorrect"
                   assert_equal '2009-12-31', issue.due_date.to_s, "Due date is incorrect"

test/unit/issue_test.rb +34 0

@@ -766,6 +766,40 class IssueTest < ActiveSupport::TestCase
766	assert_nil issue.custom_field_value(cf2)	766	assert_nil issue.custom_field_value(cf2)
767	end	767	end
768		768
		769	def test_safe_attributes_should_ignore_unassignable_assignee
		770	issue = Issue.new(:project_id => 1, :tracker_id => 1, :author_id => 3,
		771	:status_id => 1, :priority => IssuePriority.all.first,
		772	:subject => 'test_create')
		773	assert issue.valid?
		774
		775	# locked user, not allowed
		776	issue.safe_attributes=({'assigned_to_id' => '5'})
		777	assert_nil issue.assigned_to_id
		778	# no member
		779	issue.safe_attributes=({'assigned_to_id' => '1'})
		780	assert_nil issue.assigned_to_id
		781	# user 2 is ok
		782	issue.safe_attributes=({'assigned_to_id' => '2'})
		783	assert_equal 2, issue.assigned_to_id
		784	assert issue.save
		785
		786	issue.reload
		787	assert_equal 2, issue.assigned_to_id
		788	issue.safe_attributes=({'assigned_to_id' => '5'})
		789	assert_equal 2, issue.assigned_to_id
		790	issue.safe_attributes=({'assigned_to_id' => '1'})
		791	assert_equal 2, issue.assigned_to_id
		792	# user 3 is also ok
		793	issue.safe_attributes=({'assigned_to_id' => '3'})
		794	assert_equal 3, issue.assigned_to_id
		795	assert issue.save
		796
		797	# removal of assignee
		798	issue.safe_attributes=({'assigned_to_id' => ''})
		799	assert_nil issue.assigned_to_id
		800	assert issue.save
		801	end
		802
769	def test_editable_custom_field_values_should_return_non_readonly_custom_values	803	def test_editable_custom_field_values_should_return_non_readonly_custom_values
770	cf1 = IssueCustomField.create!(:name => 'Writable field', :field_format => 'string',	804	cf1 = IssueCustomField.create!(:name => 'Writable field', :field_format => 'string',
771	:is_for_all => true, :tracker_ids => [1, 2])	805	:is_for_all => true, :tracker_ids => [1, 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