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

remove trailing white-spaces from app/models/journal.rb.

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6855 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2011-08-31 07:04:22 +00:00
parent aa2caae09b
commit f58c2f87c2
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/models/journal.rb
View File

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