Auftrags-Controller: Beleg neu laden nach "Speichern und drucken"/Druckvorschau.

Sonst wird die Belegnummer nicht angezeigt, falls die Änderbarkeit von
Belegnummern abgeschaltet ist.
Zudem wurde die Projektnummer nicht angezeigt, wenn das automatische anlegen von
Projekten aktiv ist. Das Projekt exisitert dann aber schon und ein erneutes
Speichern schlägt fehl.

behebt #498 (redmine)

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index de1fad59fec02a2993a3e8fd603a72432fb9e28c..97dc5c94dc42d2f9b7e40860b13901272f889a28 100644 (file)
--- a/SL/Controller/Order.pm
+++ b/SL/Controller/Order.pm
@@ -330,7 +330,7 @@ sub action_print {
 
   if ($media eq 'screen') {
     # screen/download
 
   if ($media eq 'screen') {
     # screen/download

-    $self->js->flash('info', t8('The document has been created.'));
+    flash_later('info', t8('The document has been created.'));

     $self->send_file(
       \$doc,
       type         => SL::MIME->mime_type_from_ext($doc_filename),
     $self->send_file(
       \$doc,
       type         => SL::MIME->mime_type_from_ext($doc_filename),


@@ -346,20 +346,24 @@ sub action_print {
       content => $doc,
     );
 
       content => $doc,
     );
 

-    $self->js->flash('info', t8('The document has been printed.'));
+    flash_later('info', t8('The document has been printed.'));

   }
 
   my @warnings = $self->store_doc_to_webdav_and_filemanagement($doc, $doc_filename, $formname);
   if (scalar @warnings) {
   }
 
   my @warnings = $self->store_doc_to_webdav_and_filemanagement($doc, $doc_filename, $formname);
   if (scalar @warnings) {

-    $self->js->flash('warning', $_) for @warnings;
+    flash_later('warning', $_) for @warnings;

   }
 
   $self->save_history('PRINTED');
 
   }
 
   $self->save_history('PRINTED');
 

-  $self->js
-    ->run('kivi.ActionBar.setEnabled', '#save_and_email_action')
-    ->render;
+  my @redirect_params = (
+    action => 'edit',
+    type   => $self->type,
+    id     => $self->order->id,
+  );
+  $self->js->redirect_to($self->url_for(@redirect_params))->render;

 }
 }

+

 sub action_preview_pdf {
   my ($self) = @_;
 
 sub action_preview_pdf {
   my ($self) = @_;
 


@@ -395,14 +399,21 @@ sub action_preview_pdf {
     return $self->js->flash('error', t8('Conversion to PDF failed: #1', $errors[0]))->render;
   }
   $self->save_history('PREVIEWED');
     return $self->js->flash('error', t8('Conversion to PDF failed: #1', $errors[0]))->render;
   }
   $self->save_history('PREVIEWED');

-  $self->js->flash('info', t8('The PDF has been previewed'));
+  flash_later('info', t8('The PDF has been previewed'));

   # screen/download
   $self->send_file(
     \$pdf,
     type         => SL::MIME->mime_type_from_ext($pdf_filename),
     name         => $pdf_filename,
   # screen/download
   $self->send_file(
     \$pdf,
     type         => SL::MIME->mime_type_from_ext($pdf_filename),
     name         => $pdf_filename,

-    js_no_render => 0,
+    js_no_render => 1,
+  );
+
+  my @redirect_params = (
+    action => 'edit',
+    type   => $self->type,
+    id     => $self->order->id,

   );
   );

+  $self->js->redirect_to($self->url_for(@redirect_params))->render;

 }
 
 # open the email dialog
 }
 
 # open the email dialog