CsvImportProfiles an den erstellenden Benutzer gebunden

diff --git a/SL/Controller/CsvImport.pm b/SL/Controller/CsvImport.pm
index 99f53c0bd8852b440e75662ebe8f80a08ea74701..34b794fdbe1fcbb98455e490d0a58742b0ef463e 100644 (file)
--- a/SL/Controller/CsvImport.pm
+++ b/SL/Controller/CsvImport.pm
@@ -53,7 +53,7 @@ sub action_import {
 sub action_save {
   my ($self) = @_;
 
 sub action_save {
   my ($self) = @_;
 

-  $self->profile_from_form(SL::DB::Manager::CsvImportProfile->find_by(name => $::form->{profile}->{name}));
+  $self->profile_from_form(SL::DB::Manager::CsvImportProfile->find_by(name => $::form->{profile}->{name}, login => $::myconfig{login}));

   $self->profile->save;
 
   flash_later('info', $::locale->text("The profile has been saved under the name '#1'.", $self->profile->name));
   $self->profile->save;
 
   flash_later('info', $::locale->text("The profile has been saved under the name '#1'.", $self->profile->name));


@@ -63,7 +63,7 @@ sub action_save {
 sub action_destroy {
   my $self = shift;
 
 sub action_destroy {
   my $self = shift;
 

-  my $profile = SL::DB::CsvImportProfile->new(id => $::form->{profile}->{id});
+  my $profile = SL::DB::CsvImportProfile->new(id => $::form->{profile}->{id}, login => $::myconfig{login});

   $profile->delete(cascade => 1);
 
   flash_later('info', $::locale->text('The profile \'#1\' has been deleted.', $profile->name));
   $profile->delete(cascade => 1);
 
   flash_later('info', $::locale->text('The profile \'#1\' has been deleted.', $profile->name));


@@ -193,21 +193,26 @@ sub test_and_import {
 sub load_default_profile {
   my ($self) = @_;
 
 sub load_default_profile {
   my ($self) = @_;
 

+  my $profile;

   if ($::form->{profile}->{id}) {
   if ($::form->{profile}->{id}) {

-    $self->profile(SL::DB::CsvImportProfile->new(id => $::form->{profile}->{id})->load);
-
-  } else {
-    $self->profile(SL::DB::Manager::CsvImportProfile->find_by(type => $self->{type}, is_default => 1));
-    $self->profile(SL::DB::CsvImportProfile->new(type => $self->{type})) unless $self->profile;
+    $profile = SL::DB::Manager::CsvImportProfile->find_by(id => $::form->{profile}->{id}, login => $::myconfig{login});

   }
   }

+  $profile ||= SL::DB::Manager::CsvImportProfile->find_by(type => $self->{type}, is_default => 1, login => $::myconfig{login});
+  $profile ||= SL::DB::CsvImportProfile->new(type => $self->{type}, login => $::myconfig{login});

 
 

+  $self->profile($profile);

   $self->profile->set_defaults;
 }
 
 sub load_all_profiles {
   my ($self, %params) = @_;
 
   $self->profile->set_defaults;
 }
 
 sub load_all_profiles {
   my ($self, %params) = @_;
 

-  $self->all_profiles(SL::DB::Manager::CsvImportProfile->get_all(where => [ type => $self->type ], sort_by => 'name'));
+  $self->all_profiles(SL::DB::Manager::CsvImportProfile->get_all(
+    where => [
+      type  => $self->type,
+      login => $::myconfig{login},
+    ],
+  sort_by => 'name'));

 }
 
 sub profile_from_form {
 }
 
 sub profile_from_form {


@@ -230,7 +235,7 @@ sub profile_from_form {
   }
 
   delete $::form->{profile}->{id};
   }
 
   delete $::form->{profile}->{id};

-  $self->profile($existing_profile || SL::DB::CsvImportProfile->new);
+  $self->profile($existing_profile || SL::DB::CsvImportProfile->new(login => $::myconfig{login}));

   $self->profile->assign_attributes(%{ $::form->{profile} });
   $self->profile->settings(map({ { key => $_, value => $::form->{settings}->{$_} } } keys %{ $::form->{settings} }),
                            @settings);
   $self->profile->assign_attributes(%{ $::form->{profile} });
   $self->profile->settings(map({ { key => $_, value => $::form->{settings}->{$_} } } keys %{ $::form->{settings} }),
                            @settings);

diff --git a/SL/DB/MetaSetup/CsvImportProfile.pm b/SL/DB/MetaSetup/CsvImportProfile.pm
index 0acc97d94e478818725a98c40e040158a90d7dc0..fb0d3da8e0982f5ec71ab73df461074e6dda7e7f 100644 (file)
--- a/SL/DB/MetaSetup/CsvImportProfile.pm
+++ b/SL/DB/MetaSetup/CsvImportProfile.pm
@@ -14,6 +14,7 @@ __PACKAGE__->meta->setup(
     name       => { type => 'text', not_null => 1 },
     type       => { type => 'varchar', length => 20, not_null => 1 },
     is_default => { type => 'boolean', default => 'false' },
     name       => { type => 'text', not_null => 1 },
     type       => { type => 'varchar', length => 20, not_null => 1 },
     is_default => { type => 'boolean', default => 'false' },

+    login      => { type => 'text' },

   ],
 
   primary_key_columns => [ 'id' ],
   ],
 
   primary_key_columns => [ 'id' ],

diff --git a/sql/Pg-upgrade2/csv_import_profiles_2.sql b/sql/Pg-upgrade2/csv_import_profiles_2.sql
new file mode 100644 (file)
index 0000000..efe2dd4
--- /dev/null
+++ b/sql/Pg-upgrade2/csv_import_profiles_2.sql
@@ -0,0 +1,6 @@
+-- @tag: csv_import_profiles_2
+-- @description: Tempflag in CSV-Import-Profilen
+-- @depends: csv_import_profiles
+-- @charset: utf-8
+
+ALTER TABLE csv_import_profiles ADD COLUMN login TEXT;