resolve_controller.rb in umlaut-3.0.0beta2

- old
+ new

@@ -10,12 +10,11 @@
   # will not create a @user_request if an existing one can't be found.
   # Used for actions meant only to deal with existing requests. 
   @@no_create_request_actions = ['background_update']
   after_filter :save_request
   
-  # Take layout from config, default to resolve_basic.rhtml layout. 
-  layout umlaut_config.resolve_layout,  
+  layout :layout_name,  
          :except => [:partial_html_sections]
   
   	
   def index
     self.service_dispatch()
@@ -135,9 +134,14 @@
   end  
 
   protected
   
   
+  # We intentionally use a method calculated at request-time for layout,
+  # so it can be changed in config at request-time. 
+  def layout_name
+    umlaut_config.resolve_layout
+  end
 
     
   # Retrives or sets up the relevant Umlaut Request, and returns it. 
   def init_processing
     # intentionally trigger creation of session if it didn't already exist