From ba788c336d0d860043d680134c8ff05dceca52a5 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Fri, 3 Mar 2017 19:12:51 +0000 Subject: [PATCH] REST API: option to get the project activities for time entries (#7506). git-svn-id: http://svn.redmine.org/redmine/trunk@16365 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/projects_helper.rb | 7 ++++++- test/integration/api_test/projects_test.rb | 8 ++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index e8115205b..3e1f0d804 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -120,11 +120,16 @@ module ProjectsHelper end end if include_in_api_response?('issue_categories') + api.array :time_entry_activities do + project.activities.each do |activity| + api.time_entry_activity(:id => activity.id, :name => activity.name) + end + end if include_in_api_response?('time_entry_activities') + api.array :enabled_modules do project.enabled_modules.each do |enabled_module| api.enabled_module(:id => enabled_module.id, :name => enabled_module.name) end end if include_in_api_response?('enabled_modules') - end end diff --git a/test/integration/api_test/projects_test.rb b/test/integration/api_test/projects_test.rb index 7f9eeeb54..7b9c58a13 100644 --- a/test/integration/api_test/projects_test.rb +++ b/test/integration/api_test/projects_test.rb @@ -114,6 +114,14 @@ class Redmine::ApiTest::ProjectsTest < Redmine::ApiTest::Base assert_select 'issue_categories[type=array] issue_category[id="2"][name=Recipes]' end + test "GET /projects/:id.xml with include=time_entry_activities should return activities" do + get '/projects/1.xml?include=time_entry_activities' + assert_response :success + assert_equal 'application/xml', @response.content_type + + assert_select 'time_entry_activities[type=array] time_entry_activity[id="10"][name=Development]' + end + test "GET /projects/:id.xml with include=trackers should return trackers" do get '/projects/1.xml?include=trackers' assert_response :success