Refactor reportable_url helper to focus on just the title choices.

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

diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 715696445e51241eec86aa98b16253edc687a6ba..456507d4caa1856963c2e391c9795cef653cc6a1 100644 (file)
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -7,7 +7,7 @@ module IssuesHelper
     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
+      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"
@@ -15,19 +15,18 @@ module IssuesHelper
     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
+  def reportable_title(reportable)
+    case reportable
+    when DiaryEntry
+      reportable.title
+    when User
+      reportable.display_name
+    when DiaryComment
+      "#{reportable.diary_entry.title}, Comment id ##{reportable.id}"
+    when Changeset
+      "Changeset ##{reportable.id}"
+    when Note
+      "Note ##{reportable.id}"
     end
   end
 
@@ -39,36 +38,11 @@ module IssuesHelper
     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
+      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
     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 += arrow
-    end
-    # FIXME: link_to title, params.merge(:sort => column, :direction => direction)
-  end
-
-  def report_type(report_class)
-    case report_class
-    when "DiaryEntry"
-      t("activerecord.models.diary_entry")
-    when "User"
-      t("activerecord.models.user")
-    when "DiaryComment"
-      t("activerecord.models.diary_comment")
-    when "Changeset"
-      t("activerecord.models.changeset")
-    when "Note"
-      t("activerecord.models.note")
-    end
-  end
 end