jro_apps/redmine Commit - r3948:db110304105a

Refactor: move method to model. (references r4057)...

Eric Davis -

r3948:db110304105a

parent child

Context file:

r3948:db110304105a

Collapse all files

app/helpers/journals_helper.rb 0 -7

             # redMine - project management software
             # Copyright (C) 2006-2008  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # 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.
             module JournalsHelper
               def render_notes(issue, journal, options={})
                 content = ''
                 editable = User.current.logged? && (User.current.allowed_to?(:edit_issue_notes, issue.project) || (journal.user == User.current && User.current.allowed_to?(:edit_own_issue_notes, issue.project)))
                 links = []
                 if !journal.notes.blank?
                   links << link_to_remote(image_tag('comment.png'),
                                           { :url => {:controller => 'journals', :action => 'new', :id => issue, :journal_id => journal} },
                                           :title => l(:button_quote)) if options[:reply_links]
                   links << link_to_in_place_notes_editor(image_tag('edit.png'), "journal-#{journal.id}-notes",
                                                          { :controller => 'journals', :action => 'edit', :id => journal },
                                                             :title => l(:button_edit)) if editable
                 end
                 content << content_tag('div', links.join(' '), :class => 'contextual') unless links.empty?
                 content << textilizable(journal, :notes)
                 css_classes = "wiki"
                 css_classes << " editable" if editable
                 content_tag('div', content, :id => "journal-#{journal.id}-notes", :class => css_classes)
               end
               def link_to_in_place_notes_editor(text, field_id, url, options={})
                 onclick = "new Ajax.Request('#{url_for(url)}', {asynchronous:true, evalScripts:true, method:'get'}); return false;"
                 link_to text, '#', options.merge(:onclick => onclick)
               end
-              def css_journal_classes(journal)
-                s = 'journal'
-                s << ' has-notes' unless journal.notes.blank?
-                s << ' has-details' unless journal.details.blank?
-              end
             end

app/models/journal.rb +8 0

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # 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.
             class Journal < ActiveRecord::Base
               belongs_to :journalized, :polymorphic => true
               # 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,
                             :type => Proc.new {|o| (s = o.new_status) ? (s.is_closed? ? 'issue-closed' : 'issue-edit') : 'issue-note' },
                             :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o.issue.id, :anchor => "change-#{o.id}"}}
               acts_as_activity_provider :type => 'issues',
                                         :permission => :view_issues,
                                         :author_key => :user_id,
                                         :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 <> '')"}
               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
+              # Returns a string of css classes
+              def css_classes
+                s = 'journal'
+                s << ' has-notes' unless notes.blank?
+                s << ' has-details' unless details.blank?
+                s
+              end
             end

app/views/issues/_history.rhtml +1 -1

             <% reply_links = authorize_for('issues', 'edit') -%>
             <% for journal in journals %>
-              <div id="change-<%= journal.id %>" class="<%= css_journal_classes(journal) %>">
+              <div id="change-<%= journal.id %>" class="<%= journal.css_classes %>">
                 <h4><div class="journal-link"><%= link_to "##{journal.indice}", :anchor => "note-#{journal.indice}" %></div>
                 <%= avatar(journal.user, :size => "24") %>
                 <%= content_tag('a', '', :name => "note-#{journal.indice}")%>
             		<%= authoring journal.created_on, journal.user, :label => :label_updated_time_by %></h4>
                 <% if journal.details.any? %>
                 <ul class="details">
                   <% for detail in journal.details %>
                    <li><%= show_detail(detail) %></li>
                   <% end %>
                 </ul>
                 <% end %>
                 <%= render_notes(issue, journal, :reply_links => reply_links) unless journal.notes.blank? %>
               </div>
               <%= call_hook(:view_issues_history_journal_bottom, { :journal => journal }) %>
             <% end %>

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