diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index ce4e5814b..dc4818cb0 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -59,6 +59,10 @@ class IssuesController < ApplicationController @issue_count = @query.issue_count @issues = @query.issues(:offset => @offset, :limit => @limit) Issue.load_visible_relations(@issues) if include_in_api_response?('relations') + if User.current.allowed_to?(:view_time_entries, nil, :global => true) + Issue.load_visible_spent_hours(@issues) + Issue.load_visible_total_spent_hours(@issues) + end end format.atom do @issues = @query.issues(:limit => Setting.feeds_limit.to_i) diff --git a/app/views/issues/index.api.rsb b/app/views/issues/index.api.rsb index 4bba32549..da60ea5c6 100644 --- a/app/views/issues/index.api.rsb +++ b/app/views/issues/index.api.rsb @@ -19,6 +19,11 @@ api.array :issues, api_meta(:total_count => @issue_count, :offset => @offset, :l api.done_ratio issue.done_ratio api.is_private issue.is_private api.estimated_hours issue.estimated_hours + api.total_estimated_hours issue.total_estimated_hours + if User.current.allowed_to?(:view_time_entries, issue.project) + api.spent_hours(issue.spent_hours) + api.total_spent_hours(issue.total_spent_hours) + end render_api_custom_values issue.visible_custom_field_values, api