summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2020-03-04 07:45:36 +0000
committerGo MAEDA <maeda@farend.jp>2020-03-04 07:45:36 +0000
commit5c1f407d8229766fbde62c33d28be13699f49a02 (patch)
tree3dced6ef689937a49293702bd71ed2fc4b80d584 /app
parente4b73933a89ed886af158af12fbaa1981e726333 (diff)
downloadredmine-5c1f407d8229766fbde62c33d28be13699f49a02.tar.gz
redmine-5c1f407d8229766fbde62c33d28be13699f49a02.zip
Merged r19554 from trunk to 4.1-stable (#33052).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19557 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/helpers/timelog_helper.rb10
1 files changed, 9 insertions, 1 deletions
diff --git a/app/helpers/timelog_helper.rb b/app/helpers/timelog_helper.rb
index d10b57332..e0cc51d27 100644
--- a/app/helpers/timelog_helper.rb
+++ b/app/helpers/timelog_helper.rb
@@ -68,7 +68,15 @@ module TimelogHelper
"[#{l(:label_none)}]"
elsif k = criteria_options[:klass]
obj = k.find_by_id(value.to_i)
- format_object(obj, html)
+ if obj.is_a?(Issue)
+ if obj.visible?
+ html ? link_to_issue(obj) : "#{obj.tracker} ##{obj.id}: #{obj.subject}"
+ else
+ "##{obj.id}"
+ end
+ else
+ format_object(obj, html)
+ end
elsif cf = criteria_options[:custom_field]
format_value(value, cf)
else