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

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

diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 9ecb70e3540295ca5fb2c49f5f43da5251437de2..e6c1adb16437ce2cefe33722155028b7d8f1c903 100644 (file)
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -1,29 +1,36 @@
 module IssuesHelper
 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
+      url_for(:controller => :browse, :action => :note, :id => reportable.id)
+    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}, Closed at: #{l(reportable.closed_at.to_datetime, :format => :long)}",             :controller => :browse,
-                                                                                                                                                                                                       :action => :changeset,
-                                                                                                                                                                                                       :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 open_issues_count
+    count = Issue.visible_to(current_user).open.limit(100).size
+    if count > 99
+      tag.span("99+", :class => "count-number")
+    elsif count.positive?
+      tag.span(count, :class => "count-number")
+    end
+  end

 end
 end