Merge remote-tracking branch 'upstream/pull/1972'
[rails.git] / app / helpers / issues_helper.rb
index cfde880..092050b 100644 (file)
@@ -4,7 +4,7 @@ module IssuesHelper
     when DiaryEntry
       url_for(:controller => reportable.class.name.underscore, :action => :view, :display_name => reportable.user.display_name, :id => reportable.id)
     when User
-      url_for(:controller => reportable.class.name.underscore, :action => :view, :display_name => reportable.display_name)
+      user_url(reportable)
     when DiaryComment
       url_for(:controller => reportable.diary_entry.class.name.underscore, :action => :view, :display_name => reportable.diary_entry.user.display_name, :id => reportable.diary_entry.id, :anchor => "comment#{reportable.id}")
     when Note
@@ -24,4 +24,13 @@ module IssuesHelper
       I18n.t("issues.helper.reportable_title.note", :note_id => reportable.id)
     end
   end
+
+  def open_issues_count
+    count = Issue.visible_to(current_user).open.limit(100).size
+    if count > 99
+      content_tag(:span, "99+", :class => "count-number")
+    elsif count > 0
+      content_tag(:span, count, :class => "count-number")
+    end
+  end
 end