Makes users optional in GET /groups/:id (#8981).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9765 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/groups/show.api.rsb b/app/views/groups/show.api.rsb
index 764bdcedaca4d0231ea4f98ba1b09501f7b43dbe..626474410c39beb6fea5dd9988e18836ab09d70b 100644 (file)
--- a/app/views/groups/show.api.rsb
+++ b/app/views/groups/show.api.rsb
@@ -8,7 +8,7 @@ api.group do
     @group.users.each do |user|
       api.user :id => user.id, :name => user.name
     end
-  end
+  end if include_in_api_response?('users')
 
   api.array :memberships do
     @group.memberships.each do |membership|

diff --git a/test/integration/api_test/groups_test.rb b/test/integration/api_test/groups_test.rb
index fdc7983dd691d2079bc0c9a66209037b15575ed4..9fbcb02d24cd514e40e15682052ab1636b6dbe3e 100644 (file)
--- a/test/integration/api_test/groups_test.rb
+++ b/test/integration/api_test/groups_test.rb
@@ -76,6 +76,15 @@ class ApiTest::GroupsTest < ActionController::IntegrationTest
         assert_select 'group' do
           assert_select 'name', :text => 'A Team'
           assert_select 'id', :text => '10'
+        end
+      end
+
+      should "include users if requested" do
+        get '/groups/10.xml?include=users', {}, credentials('admin')
+        assert_response :success
+        assert_equal 'application/xml', response.content_type
+
+        assert_select 'group' do
           assert_select 'users' do
             assert_select 'user', Group.find(10).users.count
             assert_select 'user[id=8]'