1 files changed, 7 insertions, 2 deletions
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