diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 479b2a29..b7865ecd 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -54,9 +54,7 @@ module ApplicationHelper end def link_to_issue(issue, options={}) - options[:class] ||= '' - options[:class] << ' issue' - options[:class] << ' closed' if issue.closed? + options[:class] ||= issue.css_classes link_to "#{issue.tracker.name} ##{issue.id}", {:controller => "issues", :action => "show", :id => issue}, options end diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 7eae3314..a85a83a2 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -33,16 +33,6 @@ module IssuesHelper "#{@cached_label_priority}: #{issue.priority.name}" end - # Returns a string of css classes that apply to the given issue - def css_issue_classes(issue) - s = "issue status-#{issue.status.position} priority-#{issue.priority.position}" - s << ' closed' if issue.closed? - s << ' overdue' if issue.overdue? - s << ' created-by-me' if User.current.logged? && issue.author_id == User.current.id - s << ' assigned-to-me' if User.current.logged? && issue.assigned_to_id == User.current.id - s - end - def sidebar_queries unless @sidebar_queries # User can see public queries and his own queries diff --git a/app/models/issue.rb b/app/models/issue.rb index c3627ddb..23035b92 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -269,6 +269,16 @@ class Issue < ActiveRecord::Base "#{tracker} ##{id}: #{subject}" end + # Returns a string of css classes that apply to the issue + def css_classes + s = "issue status-#{status.position} priority-#{priority.position}" + s << ' closed' if closed? + s << ' overdue' if overdue? + s << ' created-by-me' if User.current.logged? && author_id == User.current.id + s << ' assigned-to-me' if User.current.logged? && assigned_to_id == User.current.id + s + end + private # Callback on attachment deletion diff --git a/app/views/common/_calendar.rhtml b/app/views/common/_calendar.rhtml index f3d02d43..d8a7f408 100644 --- a/app/views/common/_calendar.rhtml +++ b/app/views/common/_calendar.rhtml @@ -11,7 +11,7 @@ while day <= calendar.enddt %>
<%= day.day %>
<% calendar.events_on(day).each do |i| %> <% if i.is_a? Issue %> -