Merge branch 'b-3.6.1' into mebil

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

diff --git a/SL/Controller/CsvImport/Base.pm b/SL/Controller/CsvImport/Base.pm
index fe8af336ab047a01d420181eabf9d3f67a52e891..1aaec79c9555cc7681596f4d4f8365f19c613aa3 100644 (file)
--- a/SL/Controller/CsvImport/Base.pm
+++ b/SL/Controller/CsvImport/Base.pm
@@ -293,6 +293,7 @@ sub handle_cvars {
 
   my %type_to_column = ( text      => 'text_value',
                          textfield => 'text_value',
 
   my %type_to_column = ( text      => 'text_value',
                          textfield => 'text_value',

+                         htmlfield => 'text_value',

                          select    => 'text_value',
                          date      => 'timestamp_value_as_date',
                          timestamp => 'timestamp_value_as_date',
                          select    => 'text_value',
                          date      => 'timestamp_value_as_date',
                          timestamp => 'timestamp_value_as_date',


@@ -539,9 +540,11 @@ sub save_objects {
     SL::DB->client->with_transaction(sub {
       foreach my $entry_index ($chunk_size * $chunk .. min( $last_index, $chunk_size * ($chunk + 1) - 1 )) {
         my $entry = $data->[$entry_index];
     SL::DB->client->with_transaction(sub {
       foreach my $entry_index ($chunk_size * $chunk .. min( $last_index, $chunk_size * ($chunk + 1) - 1 )) {
         my $entry = $data->[$entry_index];

-        next if @{ $entry->{errors} };

 
         my $object = $entry->{object_to_save} || $entry->{object};
 
         my $object = $entry->{object_to_save} || $entry->{object};

+        $self->save_additions_always($object);
+
+        next if @{ $entry->{errors} };

 
         my $ret;
         if (!eval { $ret = $object->save(cascade => !!$self->save_with_cascade()); 1 }) {
 
         my $ret;
         if (!eval { $ret = $object->save(cascade => !!$self->save_with_cascade()); 1 }) {


@@ -602,6 +605,18 @@ sub save_additions {
   return;
 }
 
   return;
 }
 

+sub save_additions_always {
+  my ($self, $object) = @_;
+
+  # Can be overridden by derived specialized importer classes to save
+  # additional tables always.
+  # This sub is called before the object is saved. Therefore this
+  # hook will always be executed whether or not the import entry can be saved successfully.
+
+  return;
+}
+
+

 sub _save_history {
   my ($self, $object) = @_;
 
 sub _save_history {
   my ($self, $object) = @_;