kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix typo of Enumeration#overridding_change? 

git-svn-id: http://svn.redmine.org/redmine/trunk@13056 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2014-04-06 13:32:35 +00:00
parent 01ac064935
commit 5e0d93b689
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/enumeration.rb
View File

@ -104,7 +104,7 @@ class Enumeration < ActiveRecord::Base
end end
# Does the +new+ Hash override the previous Enumeration? # Does the +new+ Hash override the previous Enumeration?
def self.overridding_change?(new, previous) def self.overriding_change?(new, previous)
if (same_active_state?(new['active'], previous.active)) && same_custom_values?(new,previous) if (same_active_state?(new['active'], previous.active)) && same_custom_values?(new,previous)
return false return false
else else

4
app/models/project.rb
View File

@ -252,10 +252,10 @@ class Project < ActiveRecord::Base
parent_activity = TimeEntryActivity.find(activity['parent_id']) parent_activity = TimeEntryActivity.find(activity['parent_id'])
activity['name'] = parent_activity.name activity['name'] = parent_activity.name
activity['position'] = parent_activity.position activity['position'] = parent_activity.position
if Enumeration.overridding_change?(activity, parent_activity) if Enumeration.overriding_change?(activity, parent_activity)
project_activity = self.time_entry_activities.create(activity) project_activity = self.time_entry_activities.create(activity)
if project_activity.new_record? if project_activity.new_record?
raise ActiveRecord::Rollback, "Overridding TimeEntryActivity was not successfully saved" raise ActiveRecord::Rollback, "Overriding TimeEntryActivity was not successfully saved"
else else
self.time_entries. self.time_entries.
where(["activity_id = ?", parent_activity.id]). where(["activity_id = ?", parent_activity.id]).