Download as
Browse Code »

Commit 1cf37958ac2ac7ffeecb97fbc95c5cf2c0210a9e

Authored by Braulio Bhavamitra
Committed by Rodrigo Souto
1 parent 6ca84615
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

Don't render layout on ajax requests

Showing 1 changed file with 2 additions and 1 deletions   Show diff stats
app/controllers/application_controller.rb
  Diff comments   View file @1cf3795
... ... @@ -21,7 +21,8 @@ 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 + return nil if request.format == :js or request.xhr?
  25 +
25 26 theme_layout = theme_option(:layout)
26 27 if theme_layout
27 28 theme_view_file('layouts/'+theme_layout) || theme_layout
... ...