Adds membership ids to /users/:id API response.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8805 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-06 16:32:50 +00:00
parent dfbab5d61e
commit cdcf813fa7
2 changed files with 35 additions and 2 deletions
@@ -12,10 +12,15 @@ api.user do
  api.array :memberships do
    @memberships.each do |membership|
      api.membership do
+        api.id membership.id
        api.project :id => membership.project.id, :name => membership.project.name
        api.array :roles do
-          membership.roles.each do |role|
-            api.role :id => role.id, :name => role.name
+          membership.member_roles.each do |member_role|
+            if member_role.role
+              attrs = {:id => member_role.role.id, :name => member_role.role.name}
+              attrs.merge!(:inherited => true) if member_role.inherited_from.present?
+              api.role attrs
+            end 
          end
        end
      end if membership.project