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

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

diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 456507d4caa1856963c2e391c9795cef653cc6a1..55bd0952f7ef27047117953f1010a833a161bfba 100644 (file)
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -1,17 +1,14 @@
 module IssuesHelper
   def reportable_url(reportable)
 module IssuesHelper
   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, :anchor => "comment#{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
+    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
 
     end
   end
 


@@ -22,27 +19,18 @@ module IssuesHelper
     when User
       reportable.display_name
     when DiaryComment
     when User
       reportable.display_name
     when DiaryComment

-      "#{reportable.diary_entry.title}, Comment id ##{reportable.id}"
-    when Changeset
-      "Changeset ##{reportable.id}"
+      I18n.t("issues.helper.reportable_title.diary_comment", :entry_title => reportable.diary_entry.title, :comment_id => reportable.id)

     when Note
     when Note

-      "Note ##{reportable.id}"
+      I18n.t("issues.helper.reportable_title.note", :note_id => reportable.id)

     end
   end
 
     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, :anchor => "comment#{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
+  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(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