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 bcae2e224a9d62e3e2cc06c3fd8935a6718aafa9..4538863348c471b66caa19cdeba03d35d0a963d1 100644 (file)
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -1,92 +1,36 @@
 module IssuesHelper
+  def reportable_url(reportable)
+    case reportable
+    when DiaryEntry
+      diary_entry_url(reportable.user, reportable)
+    when User
+      user_url(reportable)
+    when DiaryComment
+      diary_entry_url(reportable.diary_entry.user, reportable.diary_entry, :anchor => "comment#{reportable.id}")
+    when Note
+      note_url(reportable)
+    end
+  end
 
-       def reportable_url(reportable)
-               class_name = reportable.class.name
-               case class_name
-               when "DiaryEntry"
-                       link_to reportable.title,       :controller => reportable.class.name.underscore,
-                                                                               :action => :view,
-                                                                               :display_name => reportable.user.display_name,
-                                                                               :id => reportable.id
-               when "User"
-                       link_to reportable.display_name.to_s,   :controller => reportable.class.name.underscore,
-                                                                                                       :action => :view,
-                                                                                                       :display_name => reportable.display_name
-               when "DiaryComment"
-                       link_to "#{reportable.diary_entry.title}, Comment id ##{reportable.id}",        :controller => reportable.diary_entry.class.name.underscore,
-                                                                                                               :action => :view,
-                                                                                                               :display_name => reportable.diary_entry.user.display_name,
-                                                                                                               :id => reportable.diary_entry.id,
-                                                                                                               :comment_id => reportable.id
-               when "Changeset"
-                       link_to "Changeset ##{reportable.id}",          :controller => :browse,
-                                                                                                               :action => :changeset,
-                                                                                                               :id => reportable.id
-               when "Note"
-                       link_to "Note ##{reportable.id}",       :controller => :browse,
-                                                                                               :action => :note,
-                                                                                               :id => reportable.id
-               else
-                       nil
-               end
-       end
+  def reportable_title(reportable)
+    case reportable
+    when DiaryEntry
+      reportable.title
+    when User
+      reportable.display_name
+    when DiaryComment
+      I18n.t("issues.helper.reportable_title.diary_comment", :entry_title => reportable.diary_entry.title, :comment_id => reportable.id)
+    when Note
+      I18n.t("issues.helper.reportable_title.note", :note_id => reportable.id)
+    end
+  end
 
-       def reports_url(issue)
-               class_name = issue.reportable.class.name
-               case class_name
-               when "DiaryEntry"
-                       link_to issue.reportable.title, issue
-               when "User"
-                       link_to issue.reportable.display_name.to_s, issue
-               when "DiaryComment"
-                       link_to "#{issue.reportable.diary_entry.title}, Comment id ##{issue.reportable.id}", issue
-               when "Changeset"
-                       link_to "Changeset ##{issue.reportable.id}",issue
-               when "Note"
-                       link_to "Note ##{issue.reportable.id}", issue
-               else
-                       nil
-               end
-       end
-
-       def instance_url(reportable)
-               class_name = reportable.class.name
-               case class_name
-               when "DiaryEntry"
-                       link_to "Show Instance",        :controller => reportable.class.name.underscore,
-                                                                               :action => :view,
-                                                                               :display_name => reportable.user.display_name,
-                                                                               :id => reportable.id
-               when "User"
-                       link_to "Show Instance",        :controller => reportable.class.name.underscore,
-                                                                               :action => :view,
-                                                                               :display_name => reportable.display_name
-               when "DiaryComment"
-                       link_to "Show Instance",        :controller => reportable.diary_entry.class.name.underscore,
-                                               :action => :view,
-                                               :display_name => reportable.diary_entry.user.display_name,
-                                               :id => reportable.diary_entry.id,
-                                               :comment_id => reportable.id
-               when "Changeset"
-                       link_to "Show Instance", :controller => :browse,
-                                                                        :action => :changeset,
-                                                                        :id => reportable.id
-               when "Note"
-                       link_to "Show Instance", :controller => :browse,
-                                                                        :action => :note,
-                                                                        :id => reportable.id
-               else
-                       nil
-               end
-       end
-
-       def sortable(column,title=nil)
-               title ||= column.titleize
-               direction = column == sort_column && sort_direction == "asc" ? "desc" : "asc"
-               if column == sort_column
-                       arrow = direction == "desc" ? ["25B2".hex].pack("U") : ["25BC".hex].pack("U")
-                       title = title + arrow
-               end
-               link_to title, params.merge(:sort => column, :direction => direction)
-       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