Ticket #307: AP-default_layouts_set_automatically.diff

layout.rb

@@ -2 +2 @@
-  module Layout #:nodoc:
-    def self.append_features(base)
-      super
-      base.extend(ClassMethods)
-      base.class_eval do
-        alias_method :render_without_layout, :render
-        alias_method :render, :render_with_layout
+        class << self
+          alias_method :inherited_without_layout, :inherited
+        end
-      end
+      base.extend(ClassMethods)
-    end
-
-    # Layouts reverse the common pattern of including shared headers and footers in many templates to isolate changes in
@@ -119 +122 @@
-      def layout(template_name)
-        write_inheritable_attribute "layout", template_name
-      end
+
+      private
+        def inherited(child)
+          inherited_without_layout(child)
+          controller = child.controller_name
+          layout_name = controller.eql?('abstract_application') ? 'application' : controller
+          child.layout(layout_name) unless layout_list.grep(/^#{layout_name}\.r(?:xml|html)$/).empty?
+        end
+
+        def layout_list
+          Dir.glob("#{RAILS_ROOT}/app/views/layouts/*.r{xml,html}").map {|l| File.basename(l)}
+        end
-    end
-
-    # Returns the name of the active layout. If the layout was specified as a method reference (through a symbol), this method
@@ -145 +160 @@
-        render_without_layout(template_name, status)
-      end
-    end
+
-  end
-end