Neuen Mandantennamen erst nach letztem Filtern erstellen

diff --git a/sql/Pg-upgrade2-auth/clients.pl b/sql/Pg-upgrade2-auth/clients.pl
index eac69dd68b736c245f1013473677a080c2e95ecc..4288546d3cece38fb10d0bf8fe4d1274eeba6006 100644 (file)
--- a/sql/Pg-upgrade2-auth/clients.pl
+++ b/sql/Pg-upgrade2-auth/clients.pl
@@ -95,7 +95,6 @@ sub _group_into_clients {
 
     push @clients, {
       map({ $_ => $user->{$_} } @copy_fields),
-      name    => $::locale->text('Client #1', scalar(@clients) + 1),
       users   => [ $user->{id} ],
       groups  => [ map { $_->{id} } @{ $self->groups } ],
       enabled => 1,
@@ -113,6 +112,7 @@ sub _group_into_clients {
   my $num = 0;
   foreach my $client (@clients) {
     $num                += 1;
+    $client->{name}    ||= $::locale->text('Client #1', $num);
     $client->{dbhost}  ||= 'localhost';
     $client->{dbport}  ||= 5432;
     $client->{templates} =~ s:templates/::;