From 426660b31d40b3d16f1458d82ea7d0c83e1f1697 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Mon, 27 Nov 2017 14:53:38 +0100 Subject: [PATCH] Supplant bug solved --- debian/changelog | 2 +- forms/admin/users/ui.xml | 2 +- forms/admin/users/users.js | 9 +++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index aeca749e..67060975 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.405.15) stable; urgency=low +hedera-web (1.405.16) stable; urgency=low * Initial Release. diff --git a/forms/admin/users/ui.xml b/forms/admin/users/ui.xml index f1b335b7..0183dfaf 100755 --- a/forms/admin/users/ui.xml +++ b/forms/admin/users/ui.xml @@ -15,7 +15,7 @@ - SELECT u.id, u.name, u.nickname + SELECT u.id, u.name, u.nickname, u.active FROM account.user u WHERE u.name LIKE CONCAT('%', #user, '%') OR u.nickname LIKE CONCAT('%', #user, '%') diff --git a/forms/admin/users/users.js b/forms/admin/users/users.js index 08b383c3..93b40407 100644 --- a/forms/admin/users/users.js +++ b/forms/admin/users/users.js @@ -13,8 +13,13 @@ Hedera.Users = new Class ,onChangeUserClick: function (button, form) { - this.gui.supplantUser (form.get ('name'), - this.onUserSupplant.bind (this)); + console.log (form.get ('active')); + + if (form.get ('active')) + this.gui.supplantUser (form.get ('name'), + this.onUserSupplant.bind (this)); + else + Htk.Toast.showError (_('The user account is disabled')); } ,onUserSupplant: function (userName)