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

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

diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 092050bf1857f078ee52e35a08d276a01fd02e77..55bd0952f7ef27047117953f1010a833a161bfba 100644 (file)
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -2,13 +2,13 @@ module IssuesHelper
   def reportable_url(reportable)
     case reportable
     when DiaryEntry
   def reportable_url(reportable)
     case reportable
     when DiaryEntry

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

     when User
       user_url(reportable)
     when DiaryComment
     when User
       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}")
+      diary_entry_url(reportable.diary_entry.user, reportable.diary_entry, :anchor => "comment#{reportable.id}")

     when Note
     when Note

-      url_for(:controller => :browse, :action => :note, :id => reportable.id)
+      note_url(reportable)

     end
   end
 
     end
   end
 


@@ -26,11 +26,11 @@ module IssuesHelper
   end
 
   def open_issues_count
   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")
+    count = Issue.visible_to(current_user).open.limit(Settings.max_issues_count).size
+    if count >= Settings.max_issues_count
+      tag.span(I18n.t("count.at_least_pattern", :count => Settings.max_issues_count), :class => "badge count-number")
+    elsif count.positive?
+      tag.span(count, :class => "badge count-number")

     end
   end
 end
     end
   end
 end