summaryrefslogtreecommitdiffstats
path: root/app/controllers
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2017-01-30 17:47:39 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2017-01-30 17:47:39 +0000
commit0f9966aadf86d90cc9cad6059ff0d03870c2b9c4 (patch)
tree493ce07038d7075d2799e032ed56321d4e6f0f70 /app/controllers
parentb67a46302f13c00b863a54d3876ba81aecd5a2c8 (diff)
downloadredmine-0f9966aadf86d90cc9cad6059ff0d03870c2b9c4.tar.gz
redmine-0f9966aadf86d90cc9cad6059ff0d03870c2b9c4.zip
Merged r16292 (#20661).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16308 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/issues_controller.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 01a127b5b..147d44097 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -112,6 +112,11 @@ class IssuesController < ApplicationController
@time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project)
@relation = IssueRelation.new
+ if User.current.allowed_to?(:view_time_entries, @project)
+ Issue.load_visible_spent_hours([@issue])
+ Issue.load_visible_total_spent_hours([@issue])
+ end
+
respond_to do |format|
format.html {
retrieve_previous_and_next_issue_ids