/ - Diff - projekt kivitendo - wissen

« Zurück | Weiter »

Revision 07cd1c32

Von Cem Aydin vor mehr als 2 Jahren hinzugefügt

ID 07cd1c32b8e3a12e3afb18d5c51f36262b2e24ca
Vorgänger a5b0b43c
Nachfolger 16485ecf

Beim Erstellen neuer Benutzer Dialog anzeigen, wenn der Loginname schon einmal
verwendet wurde.

Auswahlmöglichkeit im Dialog ob Belege von gelöschten Benutzern mit demselben
Loginnamen, dem neuen Benutzer zugewiesen werden sollen

Falls nein wird derselbe Benutzername in der employee table eindeutig
umbenannt. Falls ja bleibt das Verhalten gleich wie bis anhin.

Fix zu #501.

       my $params = delete($::form->{user})          || { };
       my $props  = delete($params->{config_values}) || { };
       my $is_new = !$params->{id};
       my $check_previously_used = delete($::form->{check_previously_used}) || 0;
       my $assign_documents = delete($::form->{assign_documents}) || 0;
       # Assign empty arrays if the browser doesn't send those controls.
       $params->{clients} ||= [];
-...
       my @errors = $self->user->validate;
       if (@errors) {
         flash('error', @errors);
         $self->edit_user_form(title => $is_new ? t8('Create a new user') : t8('Edit User'));
         return;
         $self->js->flash('error', $_) foreach @errors;
         return $self->js->render();
+      }
       # check if given login name was previously used and show a dialog if so
       if ($is_new && $check_previously_used && $self->check_loginname_previously_used()) {
         $self->js->run('show_loginname_previously_used_dialog');
         return $self->js->render();
+      }
       # rename previous usernames in employee table, if not set to assign
       if ($is_new && !$assign_documents) {
         my $clients = SL::DB::Manager::AuthClient->get_all_sorted;
         for my $client (@$clients) {
           my $now = DateTime->now_local;
           my $timestamp = $now->format_cldr('yyyyMMddHHmmss');
           my $dbh = $client->dbconnect(AutoCommit => 1);
           $dbh->do(qq|UPDATE employee SET login = ? WHERE login = ?;|,undef,
                    $params->{'login'} . $timestamp, $params->{'login'});
           $dbh->disconnect;
+        }
+      }
       $self->user->save;
-...
       return (%result, error => $::locale->text('The database user \'#1\' does not have superuser privileges.', $result{username}));
+    }
     sub check_loginname_previously_used() {
       my ($self) = @_;
       my $clients = SL::DB::Manager::AuthClient->get_all_sorted;
       for my $client (@$clients) {
         my $dbh = $client->dbconnect();
         my ($result) = $dbh->selectrow_array(qq|SELECT login FROM employee WHERE login = ?;|,undef,
                                             $self->user->{'login'});
         $dbh->disconnect;
         if ($result) {
           return 1;
+        }
+      }
       return 0;
+    }
 ;

     "June":"Juni",
     "Leading and trailing whitespaces have been removed.":"Leerzeichen wurden vorne und hinten entfernt",
     "Loading...":"Wird geladen...",
     "Login name was previously used":"Benutzername wurde schon mal verwendet",
     "Map":"Karte",
     "Mar":"März",
     "March":"März",
-...
     "The action can only be executed once.":"Die Aktion kann nur einmal ausgeführt werden.",
     "The customer order number is missing. Do you want to continue anyway?":"Die Kundenbestellnummer fehlt. Möchten Sie trotzdem fortfahren?",
     "The description is missing.":"Die Beschreibung fehlt.",
     "The login name you entered was previously used. Do you want to assign documents from the former user that had the same username to the new user?":"Der eingegebene Benutzername war schon einmal vergeben. Sollen Belege des früheren Benutzers mit dem selben Benutzernamen dem neuen Benutzer zugewiesen werden?",
     "The name is missing.":"Der Name fehlt.",
     "The name must only consist of letters, numbers and underscores and start with a letter.":"Der Name darf nur aus Buchstaben (keine Umlaute), Ziffern und Unterstrichen bestehen und muss mit einem Buchstaben beginnen.",
     "The option field is empty.":"Das Optionsfeld ist leer.",

     "June":"",
     "Leading and trailing whitespaces have been removed.":"",
     "Loading...":"",
     "Login name was previously used":"",
     "Map":"",
     "Mar":"",
     "March":"",
-...
     "The action can only be executed once.":"",
     "The customer order number is missing. Do you want to continue anyway?":"",
     "The description is missing.":"",
     "The login name you entered was previously used. Do you want to assign documents from the former user that had the same username to the new user?":"",
     "The name is missing.":"",
     "The name must only consist of letters, numbers and underscores and start with a letter.":"",
     "The option field is empty.":"",

       'Lockfile removed!'           => 'System entsperrt!',
       'Login'                       => 'Anmelden',
       'Login Name'                  => 'Benutzer',
       'Login name was previously used' => 'Benutzername wurde schon mal verwendet',
       'Login of User'               => 'Login',
       'Logout'                      => 'Abmelden',
       'Logout now'                  => 'kivitendo jetzt verlassen',
-...
       'The list has been printed.'  => 'Die Liste wurde ausgedruckt.',
       'The login is missing.'       => 'Der Loginname fehlt.',
       'The login is not unique.'    => 'Der Loginname ist nicht eindeutig.',
       'The login name you entered was previously used. Do you want to assign documents from the former user that had the same username to the new user?' => 'Der eingegebene Benutzername war schon einmal vergeben. Sollen Belege des früheren Benutzers mit dem selben Benutzernamen dem neuen Benutzer zugewiesen werden?',
       'The long description is missing.' => 'Der Langtext fehlt.',
       'The master templates where not found.' => 'Der Vorlagensatz wurde nicht gefunden.',
       'The maximum of uploadable filesize in Megabyte' => 'Die maximale Dateigröße in Megabytes, die hochladbar ist',

       'Lockfile removed!'           => '',
       'Login'                       => '',
       'Login Name'                  => '',
       'Login name was previously used' => '',
       'Login of User'               => '',
       'Logout'                      => '',
       'Logout now'                  => '',
-...
       'The list has been printed.'  => '',
       'The login is missing.'       => '',
       'The login is not unique.'    => '',
       'The login name you entered was previously used. Do you want to assign documents from the former user that had the same username to the new user?' => '',
       'The long description is missing.' => '',
       'The master templates where not found.' => '',
       'The maximum of uploadable filesize in Megabyte' => '',

     <form method="post" action="controller.pl" id="form">
      [% L.hidden_tag("user.id", SELF.user.id) %]
      [% L.hidden_tag("action", "") %]
      [% L.hidden_tag("check_previously_used", "0") %]
      [% L.hidden_tag("assign_documents", "0") %]
      [%- SET props=SELF.user.config_values %]
      <h2>[%- LxERP.t8("Settings") %]</h2>
-...
            [% L.radio_button_tag('user.config_values.mandatory_departments', value='1', id='user.config_values.mandatory_departments_1', label=LxERP.t8('Yes'), checked= props.mandatory_departments) %]
           </td>
          </tr>
         </table>
        </td>
       </tr>
-...
     <p>
      [% L.link(SELF.url_for(action="show"), LxERP.t8("Back")) %]
      [% L.button_tag("submit_with_action('save_user')", LxERP.t8("Save")) %]
      [% L.button_tag("save_new()", LxERP.t8("Save")) %]
      [% IF SELF.user.id %]
       [% L.button_tag("save_as_new()", LxERP.t8("Save as new")) %]
       [% L.button_tag("submit_delete()", LxERP.t8("Delete"), confirm=LxERP.t8("Are you sure?")) %]
-...
     [% END %]
+      }
       function save() {
         $("#action").val('Admin/save_user');
         var data = $('#form').serializeArray();
         $.post("controller.pl", data, kivi.eval_json_result);
+      }
       function save_new() {
         $("#check_previously_used").val("1");
         save();
+      }
       function save_as_new() {
         $("#user_id").val("");
         submit_with_action("save_user");
         $("#check_previously_used").val("1");
         save();
+      }
       function show_loginname_previously_used_dialog() {
         var buttons = {};
         buttons[kivi.t8('Yes')] = function() {
           $("#check_previously_used").val("0");
           $("#assign_documents").val("1");
           save();
         };
         buttons[kivi.t8('No')] = function() {
           $("#check_previously_used").val("0");
           save();
         };
         buttons[kivi.t8('Cancel')] = function() { $( this ).dialog('close'); };
         kivi.popup_dialog({
           id: 'loginname_previously_used_dialog',
           html: kivi.t8('The login name you entered was previously used. Do you want to assign documents from the former user that had the same username to the new user?'),
           dialog: {
             title:  kivi.t8('Login name was previously used'),
             width:  400,
             height: 250,
             buttons: buttons
+          }
         });
+      }
        -->
     </script>

Auch abrufbar als: Unified diff

Projekt

Allgemein

Profil

projekt kivitendo

Revision 07cd1c32

Von Cem Aydin vor mehr als 2 Jahren hinzugefügt