CsvImport: Controller erzeugt temporäres Profil, nicht der Hintergrund-Job.

diff --git a/SL/BackgroundJob/CsvImport.pm b/SL/BackgroundJob/CsvImport.pm
index 14ad33625abe3cf13a744ffa3f44742f38bed4bc..1736721b9351edde8bcfb728f0ad51685f103a1c 100644 (file)
--- a/SL/BackgroundJob/CsvImport.pm
+++ b/SL/BackgroundJob/CsvImport.pm
@@ -14,13 +14,8 @@ sub create_job {
   my $package       = ref($self_or_class) || $self_or_class;
   $package          =~ s/SL::BackgroundJob:://;
 
   my $package       = ref($self_or_class) || $self_or_class;
   $package          =~ s/SL::BackgroundJob:://;
 

-  my $profile = delete $params{profile} || SL::DB::CsvImportProfile->new;
-  my $new_profile = $profile->clone_and_reset_deep;
-  $new_profile->save;
-

   my %data = (
     %params,
   my %data = (
     %params,

-    profile_id => $new_profile->id,

     session_id => $::auth->get_session_id,
   );
 
     session_id => $::auth->get_session_id,
   );
 

diff --git a/SL/Controller/CsvImport.pm b/SL/Controller/CsvImport.pm
index 005fcd7031592ab4bbe9400e23ff4f58c720c259..09b970300dd9034ca851e8ca47fb53c270d160ed 100644 (file)
--- a/SL/Controller/CsvImport.pm
+++ b/SL/Controller/CsvImport.pm
@@ -359,9 +359,12 @@ sub test_and_import_deferred {
     return $self->action_new;
   }
 
     return $self->action_new;
   }
 

+  # save tempory profile
+  $self->profile($self->profile->clone_and_reset_deep)->save;
+

   $self->{background_job} = SL::BackgroundJob::CsvImport->create_job(
     file        => $self->csv_file_name,
   $self->{background_job} = SL::BackgroundJob::CsvImport->create_job(
     file        => $self->csv_file_name,

-    profile     => $self->profile,
+    profile_id  => $self->profile->id,

     type        => $self->profile->type,
     test        => $params{test},
     employee_id => SL::DB::Manager::Employee->current->id,
     type        => $self->profile->type,
     test        => $params{test},
     employee_id => SL::DB::Manager::Employee->current->id,