fixed dryml_fallback_tag call in page_tag_resolver and added a contro…

…ller accessor
tslocke · Oct 14, 2010 · 358b538 · 358b538
1 parent c38d037
commit 358b538
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/dryml/lib/dryml/extensions/action_controller/dryml_methods.rb b/dryml/lib/dryml/extensions/action_controller/dryml_methods.rb
@@ -4,6 +4,8 @@
     append_view_path Dryml::Railtie::PageTagResolver.new(self)
   end
 
+  attr_accessor :dryml_fallback_tag
+
   # dryml does not use layouts
   def action_has_layout?
     false
@@ -13,10 +15,6 @@ def dryml_context
     @this
   end
 
-  def dryml_fallback_tag(tag_name)
-    @dryml_fallback_tag = tag_name
-  end
-
   def call_dryml_tag(tag, options={})
     # TODO: Figure out what this bit is all about :-)
     if options[:with]

diff --git a/dryml/lib/dryml/railtie/page_tag_resolver.rb b/dryml/lib/dryml/railtie/page_tag_resolver.rb
@@ -8,7 +8,7 @@ def initialize(controller)
       end
 
       def find_templates(name, prefix, partial, details)
-        tag_name = @dryml_fallback_tag || name.dasherize + '-page'
+        tag_name = @controller.dryml_fallback_tag || name.dasherize + '-page'
         text = @controller.call_dryml_tag(tag_name)
         return [] unless text
         [ActionView::Template.new(text, "dryml-tag:#{tag_name}", Dryml::Railtie::PageTagHandler, details)]