]> source.dussan.org Git - redmine.git/commitdiff
Only show issue details in time entry activity events if the issue is visible (#23803).
authorJean-Philippe Lang <jp_lang@yahoo.fr>
Sun, 29 Jan 2017 07:54:37 +0000 (07:54 +0000)
committerJean-Philippe Lang <jp_lang@yahoo.fr>
Sun, 29 Jan 2017 07:54:37 +0000 (07:54 +0000)
Patch by Holger Just.

git-svn-id: http://svn.redmine.org/redmine/trunk@16284 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/models/time_entry.rb

index 09fcfa8a01fe15f101158b7455df0c714752381d..241ff2ffcc7b41cc50cce009941f09afccad9ed9 100644 (file)
@@ -27,7 +27,11 @@ class TimeEntry < ActiveRecord::Base
   attr_protected :user_id, :tyear, :tmonth, :tweek
 
   acts_as_customizable
-  acts_as_event :title => Proc.new {|o| "#{l_hours(o.hours)} (#{(o.issue || o.project).event_title})"},
+  acts_as_event :title => Proc.new { |o|
+                  related   = o.issue if o.issue && o.issue.visible?
+                  related ||= o.project
+                  "#{l_hours(o.hours)} (#{related.event_title})"
+                },
                 :url => Proc.new {|o| {:controller => 'timelog', :action => 'index', :project_id => o.project, :issue_id => o.issue}},
                 :author => :user,
                 :group => :issue,