Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-03-26 14:20:52 +01:00
Code Issues Packages Projects Releases Activity

Merged r16284 (#23803).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16303 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2017-01-29 10:46:15 +00:00
parent a5d45534b8
commit 0807506e18
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/time_entry.rb
View 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,