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

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

diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 7e9e233df064eea7faf89bf64759ed250a7340ea..f9a84ba7dd979bdc71fca2955f4eeafa6eb1f28d 100644 (file)
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -1,25 +1,36 @@
 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)
+    when User
+      url_for(:controller => reportable.class.name.underscore, :action => :view, :display_name => reportable.display_name)
+    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}")
+    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,        :controller => reportable.class.name.underscore,
-                                                                                                                                                               :action => "view",
-                                                                                                                                                               :display_name => reportable.diary_entry.user.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.id
+  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
 
-               else
-                       nil
-               end
-       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")
+    end
+  end
 end