Auftrags-Controller: save via ajax, damit Eingaben bei Fehlern erhalten bleiben.

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index c4624072a731ac726f1bfc2dcf80451fdc537d45..c532740b94575f8a7188df05e5699208f8db28a6 100644 (file)
--- a/SL/Controller/Order.pm
+++ b/SL/Controller/Order.pm
@@ -82,8 +82,14 @@ sub action_update {
 sub action_save {
   my ($self) = @_;
 
 sub action_save {
   my ($self) = @_;
 

-  $self->_save();
+  my $errors = $self->_save();

 
 

+  if (scalar @{ $errors }) {
+    $self->js->flash('error', $_) foreach @{ $errors };
+    return $self->js->render($self);
+  }
+
+  flash_later('info', 'The order has been saved');

   my @redirect_params = (
     action => 'edit',
     type   => $self->type,
   my @redirect_params = (
     action => 'edit',
     type   => $self->type,


@@ -308,12 +314,15 @@ sub _recalc {
 sub _save {
   my ($self) = @_;
 
 sub _save {
   my ($self) = @_;
 

+  my $errors = [];

   my $db = $self->order->db;
 
   $db->do_transaction(
     sub {
       $self->order->save();
   my $db = $self->order->db;
 
   $db->do_transaction(
     sub {
       $self->order->save();

-  }) || die($db->error);
+  }) || push(@{$errors}, $db->error);
+
+  return $errors;

 }
 
 
 }
 
 

diff --git a/templates/webpages/order/form.html b/templates/webpages/order/form.html
index b2e68a51838893df0f5bb0de1ccb4acd83c3a379..169355524b463fc4f52e1f9b933b4c4103740c20 100644 (file)
--- a/templates/webpages/order/form.html
+++ b/templates/webpages/order/form.html
@@ -30,7 +30,18 @@
 
   [% L.hidden_tag('action', 'Order/dispatch') %]
 
 
   [% L.hidden_tag('action', 'Order/dispatch') %]
 

-  [% L.submit_tag('action_update', LxERP.t8('Update')) %]
-  [% L.submit_tag('action_save', LxERP.t8('Save')) %]
+  [% L.button_tag('save()', LxERP.t8('Save')) %]</td>

 
 </form>
 
 </form>

+
+
+<script type='text/javascript'>
+
+function save() {
+  var data = $('#order_form').serialize();
+  data += '&action=Order/save';
+
+  $.post("controller.pl", data, kivi.eval_json_result);
+}
+
+</script>