Merge remote-tracking branch 'upstream/pull/2994'

[rails.git] / app / helpers / issues_helper.rb

diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 474249648bc5434dd77a575091c2e074fc695c8b..e6c1adb16437ce2cefe33722155028b7d8f1c903 100644 (file)
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -4,7 +4,7 @@ module IssuesHelper
     when DiaryEntry
       diary_entry_url(reportable.user, reportable)
     when User
     when DiaryEntry
       diary_entry_url(reportable.user, reportable)
     when User

-      url_for(:controller => reportable.class.name.underscore, :action => :view, :display_name => reportable.display_name)
+      user_url(reportable)

     when DiaryComment
       diary_entry_url(reportable.diary_entry.user, reportable.diary_entry, :anchor => "comment#{reportable.id}")
     when Note
     when DiaryComment
       diary_entry_url(reportable.diary_entry.user, reportable.diary_entry, :anchor => "comment#{reportable.id}")
     when Note


@@ -28,9 +28,9 @@ module IssuesHelper
   def open_issues_count
     count = Issue.visible_to(current_user).open.limit(100).size
     if count > 99
   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")
+      tag.span("99+", :class => "count-number")
+    elsif count.positive?
+      tag.span(count, :class => "count-number")

     end
   end
 end
     end
   end
 end