diff --git a/app/models/issue.rb b/app/models/issue.rb index 6706c27..842f773 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -403,7 +403,7 @@ class Issue < ActiveRecord::Base safe_attributes 'is_private', :if => lambda {|issue, user| user.allowed_to?(:set_issues_private, issue.project) || - (issue.author == user && user.allowed_to?(:set_own_issues_private, issue.project)) + (issue.author_id == user.id && user.allowed_to?(:set_own_issues_private, issue.project)) } safe_attributes 'parent_issue_id', @@ -673,7 +673,7 @@ class Issue < ActiveRecord::Base # Returns the initial status of the issue # Returns nil for a new issue def status_was - if status_id_was && status_id_was.to_i > 0 + if status_id_changed? && status_id_was.to_i > 0 @status_was ||= IssueStatus.find_by_id(status_id_was) end end @@ -762,7 +762,7 @@ class Issue < ActiveRecord::Base initial_status = nil if new_record? initial_status = IssueStatus.default - elsif status_id_was + elsif status_id_changed? initial_status = IssueStatus.find_by_id(status_id_was) end initial_status ||= status