Download as
Browse Code »

Commit 1cf37958ac2ac7ffeecb97fbc95c5cf2c0210a9e

Authored by Braulio Bhavamitra
Committed by Rodrigo Souto
1 parent 6ca84615
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

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,7 +21,8 @@ class ApplicationController < ActionController::Base
21 include ApplicationHelper 21 include ApplicationHelper
22 layout :get_layout 22 layout :get_layout
23 def get_layout 23 def get_layout
24 - return nil if request.format == :js 24 + return nil if request.format == :js or request.xhr?
  25 +
25 theme_layout = theme_option(:layout) 26 theme_layout = theme_option(:layout)
26 if theme_layout 27 if theme_layout
27 theme_view_file('layouts/'+theme_layout) || theme_layout 28 theme_view_file('layouts/'+theme_layout) || theme_layout