Download as
Browse Code »

Commit 712b5f51cbe4ca4b882b4104bb41e48273e333c9

Authored by Rodrigo Souto
2 parents 840db72a 15080d64
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Merge branch 'ai2977' into 'stable' 

Don't render layout for javascript format

This is the default behaviour for Rails when rendering .js.erb files. Check http://stackoverflow.com/questions/4060300/when-rendering-js-erb-file-it-renders-layout-with-the-javascript-is-it-a-bug
Showing 1 changed file with 1 additions and 0 deletions   Show diff stats
app/controllers/application_controller.rb
  Diff comments   View file @712b5f5
... ... @@ -21,6 +21,7 @@ class ApplicationController < ActionController::Base
21 21 include ApplicationHelper
22 22 layout :get_layout
23 23 def get_layout
  24 + return nil if request.format == :js
24 25 theme_layout = theme_option(:layout)
25 26 if theme_layout
26 27 theme_view_file('layouts/'+theme_layout) || theme_layout
... ...