Project

General

Profile

« Previous | Next » 

Revision 1fff0afc

Added by Thomas McKay about 9 years ago

fixes #9856 - include locations and organizations in user output

(cherry picked from commit 4d7294767840da554b382b6c37d080870537509b)

View differences:

app/views/api/v2/users/main.json.rabl
child :default_location => :default_location do
extends "api/v2/taxonomies/base", :taxonomy => :location
end
child :locations => :locations do
attributes :id, :name
end
end
if SETTINGS[:organizations_enabled]
child :default_organization => :default_organization do
extends "api/v2/taxonomies/base"
end
child :organizations => :organizations do
attributes :id, :name
end
end

Also available in: Unified diff