X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FBase.pm;h=01da48b0145e9b68f629900ba96e9fe0dd95a473;hb=808bfd679e48691da8f0b9bbb8c778ab7805cbda;hp=4b27cd98244588a63b162a7e40bfcd2bd3e2fef3;hpb=82fcb2d56c9cbe160b3ead156e148435bfc6c0b9;p=kivitendo-erp.git

diff --git a/SL/Controller/Base.pm b/SL/Controller/Base.pm
index 4b27cd982..01da48b01 100644
--- a/SL/Controller/Base.pm
+++ b/SL/Controller/Base.pm
@@ -13,7 +13,8 @@ use SL::Presenter;
 
 use Rose::Object::MakeMethods::Generic
 (
-  scalar => [ qw(action_name) ],
+  scalar                  => [ qw(action_name) ],
+  'scalar --get_set_init' => [ qw(js) ],
 );
 
 #
@@ -98,6 +99,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 +133,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};
 
@@ -157,9 +162,12 @@ sub send_file {
   if (!ref $file_name_or_content) {
     $::locale->with_raw_io(\*STDOUT, sub { print while <$file> });
     $file->close;
+    unlink $file_name_or_content if $params{unlink};
   } else {
     $::locale->with_raw_io(\*STDOUT, sub { print $$file_name_or_content });
   }
+
+  return 1;
 }
 
 sub presenter {
@@ -172,6 +180,10 @@ sub controller_name {
   return $class;
 }
 
+sub init_js {
+  SL::ClientJS->new(controller => $_[0])
+}
+
 #
 # Before/after run hooks
 #
@@ -490,6 +502,10 @@ C<%params> can include the following:
 =item * C<name> -- the name presented to the browser; defaults to
 C<$file_name>; mandatory if C<$file_name_or_content> is a reference
 
+=item * C<unlink> -- if trueish and C<$file_name_or_content> refers to
+a file name then unlink the file after it has been sent to the browser
+(e.g. for temporary files)
+
 =back
 
 =item C<url_for $url>
@@ -606,6 +622,10 @@ name the dispatching resolved to.
 Returns the global presenter object by calling
 L<SL::Presenter/get>.
 
+=item C<js>
+
+Returns an L<SL::ClientJS> instance for this controller.
+
 =back
 
 =head2 PRIVATE FUNCTIONS