Change issue count logic from (n-1)+ to n+

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

diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index cfde880cd522d77326c742ac644cceb44b105f8e..4538863348c471b66caa19cdeba03d35d0a963d1 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
-      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
-      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}")
+      diary_entry_url(reportable.diary_entry.user, reportable.diary_entry, :anchor => "comment#{reportable.id}")
     when Note
-      url_for(:controller => :browse, :action => :note, :id => reportable.id)
+      note_url(reportable)
     end
   end
 
@@ -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(Settings.max_issues_count).size
+    if count >= Settings.max_issues_count
+      tag.span("#{Settings.max_issues_count}+", :class => "badge count-number")
+    elsif count.positive?
+      tag.span(count, :class => "badge count-number")
+    end
+  end
 end