##// END OF EJS Templates
Merged r16292 (#20661)....
Jean-Philippe Lang -
r15926:0f9966aadf86
parent child
Show More
@@ -112,6 +112,11 class IssuesController < ApplicationController
112 @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project)
112 @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project)
113 @relation = IssueRelation.new
113 @relation = IssueRelation.new
114
114
115 if User.current.allowed_to?(:view_time_entries, @project)
116 Issue.load_visible_spent_hours([@issue])
117 Issue.load_visible_total_spent_hours([@issue])
118 end
119
115 respond_to do |format|
120 respond_to do |format|
116 format.html {
121 format.html {
117 retrieve_previous_and_next_issue_ids
122 retrieve_previous_and_next_issue_ids
@@ -62,7 +62,7
62 rows.right l(:field_estimated_hours), issue_estimated_hours_details(@issue), :class => 'estimated-hours'
62 rows.right l(:field_estimated_hours), issue_estimated_hours_details(@issue), :class => 'estimated-hours'
63 end
63 end
64 end
64 end
65 if User.current.allowed_to_view_all_time_entries?(@project)
65 if User.current.allowed_to?(:view_time_entries, @project)
66 if @issue.total_spent_hours > 0
66 if @issue.total_spent_hours > 0
67 rows.right l(:label_spent_time), issue_spent_hours_details(@issue), :class => 'spent-time'
67 rows.right l(:label_spent_time), issue_spent_hours_details(@issue), :class => 'spent-time'
68 end
68 end
General Comments 0
You need to be logged in to leave comments. Login now