diff .svn/pristine/d0/d0f7fd32179e3c5806e065b5d5420c390cbf89dd.svn-base @ 1338:25603efa57b5

Merge from live branch

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.svn/pristine/d0/d0f7fd32179e3c5806e065b5d5420c390cbf89dd.svn-base	Thu Jun 20 13:14:14 2013 +0100
@@ -0,0 +1,14 @@
+api.membership do
+  api.id @member.id
+  api.project :id => @member.project.id, :name => @member.project.name
+  api.__send__ @member.principal.class.name.underscore, :id => @member.principal.id, :name => @member.principal.name
+  api.array :roles do
+    @member.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