From cdcf813fa784f9e84f99e74dae8c30b8ef4494b8 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Mon, 6 Feb 2012 16:32:50 +0000 Subject: 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 --- app/views/users/show.api.rsb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'app/views') diff --git a/app/views/users/show.api.rsb b/app/views/users/show.api.rsb index 26d8a998a..b7d23ca97 100644 --- a/app/views/users/show.api.rsb +++ b/app/views/users/show.api.rsb @@ -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 -- cgit v1.2.3