From 1a4c38fddc0003ca36e2c3838b5a4c9233d51a35 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Mon, 9 Apr 2018 18:09:07 +0200 Subject: [adduser] JS checks while editing user; second save button below role list --- modules-available/adduser/page.inc.php | 5 +++- .../adduser/templates/js-add-edit.html | 26 ++++++++++++++++++ .../adduser/templates/page-adduser.html | 32 ++++------------------ .../adduser/templates/page-edituser.html | 14 ++++++---- .../adduser/templates/user-permissions.html | 12 +++++++- 5 files changed, 55 insertions(+), 34 deletions(-) create mode 100644 modules-available/adduser/templates/js-add-edit.html (limited to 'modules-available') diff --git a/modules-available/adduser/page.inc.php b/modules-available/adduser/page.inc.php index 3af4ea6d..e95cb78a 100644 --- a/modules-available/adduser/page.inc.php +++ b/modules-available/adduser/page.inc.php @@ -106,7 +106,7 @@ class Page_AddUser extends Page if ($ret > 0) { Message::addSuccess('user-edited'); } - if (!empty($pass1)) { + if (!empty($pass1) && $userid !== User::getId()) { $data = [ 'pass' => Crypto::hash6($pass1), 'userid' => $userid, @@ -168,6 +168,7 @@ class Page_AddUser extends Page } Render::openTag('form', ['class' => 'form-adduser', 'action' => '?do=adduser', 'method' => 'post']); Render::addTemplate('page-adduser'); + Render::addTemplate('js-add-edit'); if ($hasUsers) { $this->showRoles(); } @@ -184,9 +185,11 @@ class Page_AddUser extends Page if ($user === false) { Message::addError('user-not-found', $userid); } else { + $user['password_disabled'] = User::getId() === $userid ? 'disabled' : false; // TODO: LDAP -> disallow pw change, maybe other fields too? Render::openTag('form', ['class' => 'form-adduser', 'action' => '?do=adduser', 'method' => 'post']); Render::addTemplate('page-edituser', $user); + Render::addTemplate('js-add-edit'); $this->showRoles($userid); Render::closeTag('form'); } diff --git a/modules-available/adduser/templates/js-add-edit.html b/modules-available/adduser/templates/js-add-edit.html new file mode 100644 index 00000000..95454c22 --- /dev/null +++ b/modules-available/adduser/templates/js-add-edit.html @@ -0,0 +1,26 @@ + \ No newline at end of file diff --git a/modules-available/adduser/templates/page-adduser.html b/modules-available/adduser/templates/page-adduser.html index 18d79a3b..08587373 100644 --- a/modules-available/adduser/templates/page-adduser.html +++ b/modules-available/adduser/templates/page-adduser.html @@ -30,34 +30,12 @@