jro_apps/redmine Commit - r8011:42d2bf0bafce

Makes project and tracker assigned first in #attributes=...

Jean-Philippe Lang -

r8011:42d2bf0bafce

parent child

Context file:

r8011:42d2bf0bafce

Collapse all files

app/models/issue.rb +11 -7

                 write_attribute(:description, arg)
               end
-              # Overrides attributes= so that tracker_id gets assigned first
+              # Overrides attributes= so that project and tracker get assigned first
-              def attributes_with_tracker_first=(new_attributes, *args)
+              def attributes_with_project_and_tracker_first=(new_attributes, *args)
                 return if new_attributes.nil?
-                new_tracker_id = new_attributes['tracker_id'] || new_attributes[:tracker_id]
+                attrs = new_attributes.dup
-                if new_tracker_id
+                attrs.stringify_keys!
-                  self.tracker_id = new_tracker_id
+                %w(project project_id tracker tracker_id).each do |attr|
+                  if attrs.has_key?(attr)
+                    send "#{attr}=", attrs.delete(attr)
+                  end
                 end
-                send :attributes_without_tracker_first=, new_attributes, *args
+                send :attributes_without_project_and_tracker_first=, attrs, *args
               end
               # Do not redefine alias chain on reload (see #4838)
-              alias_method_chain(:attributes=, :tracker_first) unless method_defined?(:attributes_without_tracker_first=)
+              alias_method_chain(:attributes=, :project_and_tracker_first) unless method_defined?(:attributes_without_project_and_tracker_first=)
               def estimated_hours=(h)
                 write_attribute :estimated_hours, (h.is_a?(String) ? h.to_hours : h)

test/unit/issue_test.rb +11 -5

               end
               def test_should_not_update_custom_fields_on_changing_tracker_with_different_custom_fields
-                issue = Issue.new(:project_id => 1)
+                issue = Issue.create!(:project_id => 1, :tracker_id => 1, :author_id => 1, :status_id => 1, :subject => 'Test', :custom_field_values => {'2' => 'Test'})
-                issue.attributes = {:tracker_id => 1, :author_id => 1, :status_id => 1, :subject => 'Test', :custom_field_values => {'2' => 'Test'}}
-                issue.save!
                 assert !Tracker.find(2).custom_field_ids.include?(2)
                 issue = Issue.find(issue.id)
                 assert issue.custom_field_values.any?
               end
-              def test_assigning_attributes_should_assign_tracker_id_first
+              def test_assigning_attributes_should_assign_project_and_tracker_first
+                seq = sequence('seq')
+                issue = Issue.new
+                issue.expects(:project_id=).in_sequence(seq)
+                issue.expects(:tracker_id=).in_sequence(seq)
+                issue.expects(:subject=).in_sequence(seq)
+                issue.attributes = {:tracker_id => 2, :project_id => 1, :subject => 'Test'}
+              end
+              def test_assigning_tracker_and_custom_fields_should_assign_custom_fields
                 attributes = ActiveSupport::OrderedHash.new
                 attributes['custom_field_values'] = { '1' => 'MySQL' }
                 attributes['tracker_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