diff options
| author | Eric Davis <edavis@littlestreamsoftware.com> | 2010-09-05 22:57:20 +0000 |
|---|---|---|
| committer | Eric Davis <edavis@littlestreamsoftware.com> | 2010-09-05 22:57:20 +0000 |
| commit | db110304105a7758ee2d3be496c91d037f16425f (patch) | |
| tree | d63e0910e76753cdf9ac72a93868787edab78307 | |
| parent | cbe266079e9105c61bbda84c5cef89927548fcfe (diff) | |
| download | redmine-db110304105a7758ee2d3be496c91d037f16425f.tar.gz redmine-db110304105a7758ee2d3be496c91d037f16425f.zip | |
Refactor: move method to model. (references r4057)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4062 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/helpers/journals_helper.rb | 7 | ||||
| -rw-r--r-- | app/models/journal.rb | 8 | ||||
| -rw-r--r-- | app/views/issues/_history.rhtml | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/app/helpers/journals_helper.rb b/app/helpers/journals_helper.rb index 990bfb1e5..c8d53f253 100644 --- a/app/helpers/journals_helper.rb +++ b/app/helpers/journals_helper.rb @@ -39,11 +39,4 @@ module JournalsHelper 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? - s - end end diff --git a/app/models/journal.rb b/app/models/journal.rb index a0e1ae877..3e846aeb8 100644 --- a/app/models/journal.rb +++ b/app/models/journal.rb @@ -65,4 +65,12 @@ class Journal < ActiveRecord::Base 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 diff --git a/app/views/issues/_history.rhtml b/app/views/issues/_history.rhtml index 4ea2dd2ac..4851e5f22 100644 --- a/app/views/issues/_history.rhtml +++ b/app/views/issues/_history.rhtml @@ -1,6 +1,6 @@ <% 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}")%> |