Merge branch 'api' into production

Victor Costa
2 parents f9bc4e00 d1c5fe27
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
lib/noosfero/api/entities.rb
@@ -114,7 +114,7 @@ module Noosfero
         expose :permissions do |user, options|
           output = {}
           user.person.role_assignments.map do |role_assigment|
-            if role_assigment.resource.respond_to?(:identifier)
+            if role_assigment.resource.respond_to?(:identifier) && !role_assigment.role.nil?
               output[role_assigment.resource.identifier] = role_assigment.role.permissions
             end
           end
...	...	@@ -114,7 +114,7 @@ module Noosfero
114	114	expose :permissions do \|user, options\|
115	115	output = {}
116	116	user.person.role_assignments.map do \|role_assigment\|
117		- if role_assigment.resource.respond_to?(:identifier)
	117	+ if role_assigment.resource.respond_to?(:identifier) && !role_assigment.role.nil?
118	118	output[role_assigment.resource.identifier] = role_assigment.role.permissions
119	119	end
120	120	end
...	...