Rose-Fehler beim Speichern eines Objekts anzeigen lassen.

  Siehe Bug #2203.
  Siehe auch commit d16fc161b610f2ba59025fee1db94511a0c6c5cd

Rose-Fehler beim Speichern eines Objekts anzeigen lassen.

  Return-Werte im eval-Aufruf richtig behandeln.
  Betrifft #2203.

diff --git a/SL/Controller/CsvImport/Base.pm b/SL/Controller/CsvImport/Base.pm
index 92ee5565c325268999370ee3ad997d3263da6f91..6390e7d043d22570ed6790a48bd165f2d9d2d83b 100644 (file)
--- a/SL/Controller/CsvImport/Base.pm
+++ b/SL/Controller/CsvImport/Base.pm
@@ -416,7 +416,10 @@ sub save_objects {
 
     my $object = $entry->{object_to_save} || $entry->{object};
 
 
     my $object = $entry->{object_to_save} || $entry->{object};
 

-    if ( !$object->save(cascade => !!$self->save_with_cascade()) ) {
+    my $ret;
+    if (!eval { $ret = $object->save(cascade => !!$self->save_with_cascade()); 1 }) {
+      push @{ $entry->{errors} }, $::locale->text('Error when saving: #1', $@);
+    } elsif ( !$ret ) {

       push @{ $entry->{errors} }, $::locale->text('Error when saving: #1', $entry->{object}->db->error);
     } else {
       $self->_save_history($object);
       push @{ $entry->{errors} }, $::locale->text('Error when saving: #1', $entry->{object}->db->error);
     } else {
       $self->_save_history($object);