Download as
Browse Code »

Commit 861182f04a43197d3a28483a901466d163d63f18

Authored by Daniela Feitosa
2 parents 87bd3f7a 19372a8e
Exists in staging and in 14 other branches all_pending_tasks_api, api_roles, elasticsearch, elasticsearch_to_merge, environment-exposes-api, external_followers, federation_oauth_provider, follower_permition, master, oauth_external_login, private-scraps-rebase, production, profile_api_improvements, user_mention

Merge branch 'layout_template_on_api' into 'master' 

Display layout_template on api

- Environments and profiles now return the layout template used.

@marcosronaldo can you take a look at this? We'll use it on angular theme. 

See merge request !968
Showing 1 changed file with 2 additions and 0 deletions   Show diff stats
app/api/entities.rb
  Diff comments   View file @861182f
@@ -124,6 +124,7 @@ module Api @@ -124,6 +124,7 @@ module Api
124 expose :type 124 expose :type
125 expose :custom_header 125 expose :custom_header
126 expose :custom_footer 126 expose :custom_footer
  127 + expose :layout_template
127 expose :permissions do |profile, options| 128 expose :permissions do |profile, options|
128 Entities.permissions_for_entity(profile, options[:current_person], 129 Entities.permissions_for_entity(profile, options[:current_person],
129 :allow_post_content?, :allow_edit?, :allow_destroy?) 130 :allow_post_content?, :allow_edit?, :allow_destroy?)
@@ -264,6 +265,7 @@ module Api @@ -264,6 +265,7 @@ module Api
264 expose :name 265 expose :name
265 expose :id 266 expose :id
266 expose :description 267 expose :description
  268 + expose :layout_template
267 expose :settings, if: lambda { |instance, options| options[:is_admin] } 269 expose :settings, if: lambda { |instance, options| options[:is_admin] }
268 end 270 end
269 271