verdnatura/hedera-web
verdnatura
/
hedera-web
0
1
Fork 1
Code Issues Pull Requests 2 Releases Wiki Activity

Supplant bug solved

This commit is contained in:
Juan Ferrer Toribio 2017-11-27 14:53:38 +01:00
parent 79b949f86f
commit 426660b31d
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
hedera-web (1.405.15) stable; urgency=low hedera-web (1.405.16) stable; urgency=low
* Initial Release. * Initial Release.

2
forms/admin/users/ui.xml
View File

@ -15,7 +15,7 @@
<htk-repeater form-id="iter"> <htk-repeater form-id="iter">
<db-model property="model"> <db-model property="model">
<custom> <custom>
SELECT u.id, u.name, u.nickname SELECT u.id, u.name, u.nickname, u.active
FROM account.user u FROM account.user u
WHERE u.name LIKE CONCAT('%', #user, '%') WHERE u.name LIKE CONCAT('%', #user, '%')
OR u.nickname LIKE CONCAT('%', #user, '%') OR u.nickname LIKE CONCAT('%', #user, '%')

9
forms/admin/users/users.js
View File

@ -13,8 +13,13 @@ Hedera.Users = new Class
,onChangeUserClick: function (button, form) ,onChangeUserClick: function (button, form)
{ {
this.gui.supplantUser (form.get ('name'), console.log (form.get ('active'));
this.onUserSupplant.bind (this));
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) ,onUserSupplant: function (userName)