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

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

diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 64d6dcec57856e3b6c98dfa884acc155ba6fc04a..e972c78ff186fc3cd1ba4350cecaa1075df3eaa2 100644 (file)
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -25,18 +25,20 @@ module IssuesHelper
     end
   end
 
     end
   end
 

-  def reportable_dates(reportable)
+  def reportable_heading(reportable)
+    heading_params = { :title => link_to(reportable_title(reportable), reportable_url(reportable)) }
+    heading_params[:datetime_created] = reportable_heading_time(reportable.created_at)
+    heading_params[:datetime_updated] = reportable_heading_time(reportable.updated_at) unless reportable.is_a? User
+

     case reportable
     case reportable

-    when DiaryEntry, DiaryComment, Note
-      created_at_time = tag.time l(reportable.created_at.to_datetime, :format => :friendly),
-                                 :datetime => reportable.created_at.xmlschema
-      updated_at_time = tag.time l(reportable.updated_at.to_datetime, :format => :friendly),
-                                 :datetime => reportable.updated_at.xmlschema
-      t "issues.helper.reportable_dates.created_on_updated_on_html", :datetime_created => created_at_time, :datetime_updated => updated_at_time
+    when DiaryComment
+      t "issues.helper.reportable_heading.diary_comment_html", **heading_params
+    when DiaryEntry
+      t "issues.helper.reportable_heading.diary_entry_html", **heading_params
+    when Note
+      t "issues.helper.reportable_heading.note_html", **heading_params

     when User
     when User

-      created_at_time = tag.time l(reportable.created_at.to_datetime, :format => :friendly),
-                                 :datetime => reportable.created_at.xmlschema
-      t "issues.helper.reportable_dates.created_on_html", :datetime_created => created_at_time
+      t "issues.helper.reportable_heading.user_html", **heading_params

     end
   end
 
     end
   end
 


@@ -48,4 +50,10 @@ module IssuesHelper
       tag.span(count, :class => "badge count-number")
     end
   end
       tag.span(count, :class => "badge count-number")
     end
   end

+
+  private
+
+  def reportable_heading_time(datetime)
+    tag.time l(datetime.to_datetime, :format => :friendly), :datetime => datetime.xmlschema
+  end

 end
 end