From: Sven Schöling <s.schoeling@linet-services.de>
Date: Tue, 18 Nov 2014 14:48:21 +0000 (+0100)
Subject: Controller: content for header rendern
X-Git-Tag: release-3.2.0beta~242
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=ca86a307ee2df8ca82974016876709a7c4746d9a;p=kivitendo-erp.git

Controller: content for header rendern

Hat zur Folge, dass Presenterwidgets benötigte stylesheets und
javascripts anfordern können.
---

diff --git a/SL/Controller/Base.pm b/SL/Controller/Base.pm
index a233a0eb5..52ec19dcb 100644
--- a/SL/Controller/Base.pm
+++ b/SL/Controller/Base.pm
@@ -98,6 +98,18 @@ sub render {
     $options->{layout} = 0 if $options->{type} ne 'html';
   }
 
+  # Let the presenter do the rest of the work.
+  my $output;
+  {
+    local $::form->{title} = $locals{title} if $locals{title};
+    $output = $self->presenter->render(
+      $template,
+      { type => $options->{type}, process => $options->{process} },
+      %locals,
+      SELF => $self,
+    );
+  }
+
   if ($options->{header}) {
     # Output the HTTP response and the layout in case of HTML output.
 
@@ -120,14 +132,6 @@ sub render {
     }
   }
 
-  # Let the presenter do the rest of the work.
-  my $output = $self->presenter->render(
-    $template,
-    { type => $options->{type}, process => $options->{process} },
-    %locals,
-    SELF => $self,
-  );
-
   # Print the output if wanted.
   print $output if $options->{output};