[Git][noosfero/noosfero][master] 2 commits: Display layout_template on api

[Daniela Feitosa]

Daniela Feitosa pushed to branch master at Noosfero / noosfero


Commits:
19372a8e by Tallys Martins at 2016-07-04T14:54:32-03:00
Display layout_template on api

 - Environments and profiles now return the layout template used.

Signed-off-by: Tallys Martins <tallysmartins at gmail.com>

- - - - -
861182f0 by Daniela Feitosa at 2016-07-13T22:49:07+00:00
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
- - - - -


1 changed file:

- app/api/entities.rb


Changes:

=====================================
app/api/entities.rb
=====================================
--- a/app/api/entities.rb
+++ b/app/api/entities.rb
@@ -124,6 +124,7 @@ module Api
       expose :type
       expose :custom_header
       expose :custom_footer
+      expose :layout_template
       expose :permissions do |profile, options|
         Entities.permissions_for_entity(profile, options[:current_person],
         :allow_post_content?, :allow_edit?, :allow_destroy?)
@@ -264,6 +265,7 @@ module Api
       expose :name
       expose :id
       expose :description
+      expose :layout_template
       expose :settings, if: lambda { |instance, options| options[:is_admin] }
     end
 



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/87bd3f7aada1edb8622716b159ac1b38c5fa3f90...861182f04a43197d3a28483a901466d163d63f18
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20160713/df8b2de3/attachment.html>