restart apache2 in postinst

[mfinanz.git] / SL / Controller / Base.pm

diff --git a/SL/Controller/Base.pm b/SL/Controller/Base.pm
index b8f53e96a855c4100212b111469d3f4866b7a05d..3c5f919de85266eab27b2f4859947444eae5a525 100644 (file)
--- a/SL/Controller/Base.pm
+++ b/SL/Controller/Base.pm
@@ -15,7 +15,7 @@ use SL::Presenter;
 use Rose::Object::MakeMethods::Generic
 (
   scalar                  => [ qw(action_name) ],
 use Rose::Object::MakeMethods::Generic
 (
   scalar                  => [ qw(action_name) ],

-  'scalar --get_set_init' => [ qw(js) ],
+  'scalar --get_set_init' => [ qw(js p) ],

 );
 
 #
 );
 
 #


@@ -75,6 +75,7 @@ sub render {
     header     => 1,
     layout     => 1,
     process    => 1,
     header     => 1,
     layout     => 1,
     process    => 1,

+    status     => '200 ok',

   );
   $options->{$_} //= $defaults{$_} for keys %defaults;
   $options->{type} = lc $options->{type};
   );
   $options->{$_} //= $defaults{$_} for keys %defaults;
   $options->{type} = lc $options->{type};


@@ -131,7 +132,8 @@ sub render {
                         :                              'application/json';
 
       print $::form->create_http_response(content_type => $content_type,
                         :                              'application/json';
 
       print $::form->create_http_response(content_type => $content_type,

-                                          charset      => 'UTF-8');
+                                          charset      => 'UTF-8',
+                                          (status      => $options->{status}) x !!$options->{status});

     }
   }
 
     }
   }
 


@@ -154,15 +156,17 @@ sub send_file {
   }
 
   my $content_type    =  $params{type} || 'application/octet_stream';
   }
 
   my $content_type    =  $params{type} || 'application/octet_stream';

+  my $content_disposition = $params{content_disposition} || 'attachment';

   my $attachment_name =  $params{name} || (!ref($file_name_or_content) ? $file_name_or_content : '');
   $attachment_name    =~ s:.*//::g;
 
   if ($::request->is_ajax || $params{ajax}) {
     my $octets = ref $file_name_or_content ? $file_name_or_content : \ do { local $/ = undef; <$file> };
   my $attachment_name =  $params{name} || (!ref($file_name_or_content) ? $file_name_or_content : '');
   $attachment_name    =~ s:.*//::g;
 
   if ($::request->is_ajax || $params{ajax}) {
     my $octets = ref $file_name_or_content ? $file_name_or_content : \ do { local $/ = undef; <$file> };

-    $self->js->save_file(MIME::Base64::encode_base64($$octets), $content_type, $size, $attachment_name)->render;
+    $self->js->save_file(MIME::Base64::encode_base64($$octets), $content_type, $size, $attachment_name);
+    $self->js->render unless $params{js_no_render};

   } else {
     print $::form->create_http_response(content_type        => $content_type,
   } else {
     print $::form->create_http_response(content_type        => $content_type,

-                                        content_disposition => 'attachment; filename="' . $attachment_name . '"',
+                                        content_disposition => $content_disposition . '; filename="' . $attachment_name . '"',

                                         content_length      => $size);
 
     if (!ref $file_name_or_content) {
                                         content_length      => $size);
 
     if (!ref $file_name_or_content) {


@@ -181,6 +185,10 @@ sub presenter {
   return SL::Presenter->get;
 }
 
   return SL::Presenter->get;
 }
 

+sub init_p {
+  return SL::Presenter->get;
+}
+

 sub controller_name {
   my $class = ref($_[0]) || $_[0];
   $class    =~ s/^SL::Controller:://;
 sub controller_name {
   my $class = ref($_[0]) || $_[0];
   $class    =~ s/^SL::Controller:://;