diff --git a/app/models/journal.rb b/app/models/journal.rb index d0f7cc030..fe8a432b6 100644 --- a/app/models/journal.rb +++ b/app/models/journal.rb @@ -5,12 +5,12 @@ # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @@ -20,11 +20,11 @@ class Journal < ActiveRecord::Base # added as a quick fix to allow eager loading of the polymorphic association # since always associated to an issue, for now belongs_to :issue, :foreign_key => :journalized_id - + belongs_to :user has_many :details, :class_name => "JournalDetail", :dependent => :delete_all attr_accessor :indice - + acts_as_event :title => Proc.new {|o| status = ((s = o.new_status) ? " (#{s})" : nil); "#{o.issue.tracker} ##{o.issue.id}#{status}: #{o.issue.subject}" }, :description => :notes, :author => :user, @@ -36,36 +36,36 @@ class Journal < ActiveRecord::Base :find_options => {:include => [{:issue => :project}, :details, :user], :conditions => "#{Journal.table_name}.journalized_type = 'Issue' AND" + " (#{JournalDetail.table_name}.prop_key = 'status_id' OR #{Journal.table_name}.notes <> '')"} - + named_scope :visible, lambda {|*args| { :include => {:issue => :project}, :conditions => Issue.visible_condition(args.shift || User.current, *args) }} - + def save(*args) # Do not save an empty journal (details.empty? && notes.blank?) ? false : super end - + # Returns the new status if the journal contains a status change, otherwise nil def new_status c = details.detect {|detail| detail.prop_key == 'status_id'} (c && c.value) ? IssueStatus.find_by_id(c.value.to_i) : nil end - + def new_value_for(prop) c = details.detect {|detail| detail.prop_key == prop} c ? c.value : nil end - + def editable_by?(usr) usr && usr.logged? && (usr.allowed_to?(:edit_issue_notes, project) || (self.user == usr && usr.allowed_to?(:edit_own_issue_notes, project))) end - + def project journalized.respond_to?(:project) ? journalized.project : nil end - + def attachments journalized.respond_to?(:attachments) ? journalized.attachments : nil end @@ -77,11 +77,11 @@ class Journal < ActiveRecord::Base s << ' has-details' unless details.blank? s end - + def notify? @notify != false end - + def notify=(arg) @notify = arg end