From 884653412b812449c5a6bf71a0c856fe3ebe995b Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Sun, 26 Nov 2017 15:16:56 +0100 Subject: [PATCH 1/4] Ids displayed for orders and items, showing user.nickname instead of client.alias --- debian/changelog | 2 +- forms/ecomerce/catalog/ui.xml | 3 +++ forms/ecomerce/orders/ui.xml | 3 +++ js/hedera/gui.js | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b8ed3f2d..5789dae2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.405.13) stable; urgency=low +hedera-web (1.405.14) stable; urgency=low * Initial Release. diff --git a/forms/ecomerce/catalog/ui.xml b/forms/ecomerce/catalog/ui.xml index 5054641e..33b6cc07 100755 --- a/forms/ecomerce/catalog/ui.xml +++ b/forms/ecomerce/catalog/ui.xml @@ -431,6 +431,9 @@

+

+ @ +

Size , Category diff --git a/forms/ecomerce/orders/ui.xml b/forms/ecomerce/orders/ui.xml index bb2385ad..5aafbff0 100755 --- a/forms/ecomerce/orders/ui.xml +++ b/forms/ecomerce/orders/ui.xml @@ -61,6 +61,9 @@

+

+ @ +

diff --git a/js/hedera/gui.js b/js/hedera/gui.js index afa6a80f..8ac645ee 100644 --- a/js/hedera/gui.js +++ b/js/hedera/gui.js @@ -55,7 +55,7 @@ module.exports = new Class this.$('social-bar').conn = this._conn; - var sql = 'SELECT name FROM customer_user;' + var sql = 'SELECT nickname FROM account.userView;' +'SELECT default_form, image_dir, image_host FROM config;' +'SELECT production_domain, test_domain FROM config;'; this._conn.execQuery (sql, this.onMainQueryDone.bind (this)); From 79b949f86f3857eae6a68c851041f762d7ae846f Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Mon, 27 Nov 2017 14:10:03 +0100 Subject: [PATCH 2/4] Using user.nickname instead of client.alias in some forms --- debian/changelog | 2 +- forms/admin/connections/ui.xml | 5 ++--- forms/admin/users/ui.xml | 11 +++++------ forms/news/news/ui.xml | 8 ++++---- js/hedera/gui.js | 2 +- 5 files changed, 13 insertions(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5789dae2..aeca749e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.405.14) stable; urgency=low +hedera-web (1.405.15) stable; urgency=low * Initial Release. diff --git a/forms/admin/connections/ui.xml b/forms/admin/connections/ui.xml index ecc8761d..26731030 100755 --- a/forms/admin/connections/ui.xml +++ b/forms/admin/connections/ui.xml @@ -22,7 +22,7 @@ - SELECT vu.user userId, vu.stamp, c.Cliente, s.lastUpdate, + SELECT vu.user userId, vu.stamp, u.nickname, s.lastUpdate, a.platform, a.browser, a.version, u.name user FROM userSession s JOIN visitUser vu ON vu.id = s.userVisit @@ -30,7 +30,6 @@ JOIN visitAgent a ON a.id = ac.agent JOIN visit v ON v.id = a.visit JOIN account.user u ON u.id = vu.user - JOIN vn2008.Clientes c ON c.Id_cliente = vu.user ORDER BY lastUpdate DESC @@ -49,7 +48,7 @@ icon="gnome" on-click="onAccessLogClick"/>

- +

- diff --git a/forms/admin/users/ui.xml b/forms/admin/users/ui.xml index f894b5ff..f1b335b7 100755 --- a/forms/admin/users/ui.xml +++ b/forms/admin/users/ui.xml @@ -15,13 +15,12 @@ - SELECT u.id, u.name, c.Cliente + SELECT u.id, u.name, u.nickname FROM account.user u - INNER JOIN vn2008.Clientes c ON u.id = c.Id_Cliente - WHERE u.name LIKE CONCAT('%', #user, '%') - OR c.Cliente LIKE CONCAT('%', #user, '%') + WHERE u.name LIKE CONCAT('%', #user, '%') + OR u.nickname LIKE CONCAT('%', #user, '%') OR u.id = #user - ORDER BY u.name LIMIT 200 + ORDER BY u.name LIMIT 200 @@ -44,7 +43,7 @@ icon="gnome" on-click="onAccessLogClick"/>

- +

- diff --git a/forms/news/news/ui.xml b/forms/news/news/ui.xml index cf11a2c7..46e6342f 100755 --- a/forms/news/news/ui.xml +++ b/forms/news/news/ui.xml @@ -13,10 +13,10 @@ - SELECT n.id, c.Cliente, priority, image, title + SELECT n.id, u.nickname, priority, image, title FROM news n - JOIN vn2008.Clientes c ON n.user_id = c.Id_Cliente - ORDER BY priority, n.date_time DESC + JOIN account.user u ON u.id = n.user_id + ORDER BY priority, n.date_time DESC @@ -46,7 +46,7 @@

- +

Priority diff --git a/js/hedera/gui.js b/js/hedera/gui.js index 8ac645ee..63da43f5 100644 --- a/js/hedera/gui.js +++ b/js/hedera/gui.js @@ -520,7 +520,7 @@ module.exports = new Class this.loadMenu (); - var sql = 'SELECT name FROM customer_user'; + var sql = 'SELECT nickname FROM account.userView'; this._conn.execQuery (sql, this._onSupplantName.bind (this)); if (callback) From 426660b31d40b3d16f1458d82ea7d0c83e1f1697 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Mon, 27 Nov 2017 14:53:38 +0100 Subject: [PATCH 3/4] 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) From 0b28f71e0da009912c9e862d23dfbdcc0debcf5b Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Mon, 27 Nov 2017 16:27:13 +0100 Subject: [PATCH 4/4] Supplant bug solved --- debian/changelog | 2 +- forms/admin/users/locale/ca.json | 13 ++++--------- forms/admin/users/locale/en.json | 13 ++++--------- forms/admin/users/locale/es.json | 13 ++++--------- forms/admin/users/locale/fr.json | 15 +++++---------- forms/admin/users/locale/mn.json | 13 ++++--------- forms/admin/users/locale/pt.json | 13 ++++--------- forms/admin/users/style.css | 10 ++++++++++ forms/admin/users/ui.xml | 24 ++++++++++++++---------- forms/admin/users/users.js | 18 +++++++++++------- 10 files changed, 61 insertions(+), 73 deletions(-) diff --git a/debian/changelog b/debian/changelog index 67060975..a2d5e985 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.405.16) stable; urgency=low +hedera-web (1.405.17) stable; urgency=low * Initial Release. diff --git a/forms/admin/users/locale/ca.json b/forms/admin/users/locale/ca.json index e43e4bfe..308cf05e 100755 --- a/forms/admin/users/locale/ca.json +++ b/forms/admin/users/locale/ca.json @@ -1,12 +1,7 @@ { - "UserManagement": "Gestió d'usuaris" + "User management": "Gestió d'usuaris" - ,"UserName:": "Nom d'usuari:" - - ,"UserNumber": "N usuari" - ,"UserName": "Nom d'usuari" - ,"Alias": "Alias" - - ,"AccessAsUser": "Suplantar usuari" - ,"AccessLog": "Registre d'accessos" + ,"Disabled": "Deshabilitat" + ,"Impersonate user": "Suplantar usuari" + ,"Access log": "Registre d'accessos" } diff --git a/forms/admin/users/locale/en.json b/forms/admin/users/locale/en.json index 58aa9663..541b4619 100755 --- a/forms/admin/users/locale/en.json +++ b/forms/admin/users/locale/en.json @@ -1,12 +1,7 @@ { - "UserManagement": "User management" - - ,"UserName:": "Username:" - - ,"UserNumber": "User number" - ,"UserName": "Username" - ,"Alias": "Alias" + "User management": "User management" - ,"AccessAsUser": "Impersonate user" - ,"AccessLog": "Access log" + ,"Disabled": "Disabled" + ,"Impersonate user": "Impersonate user" + ,"Access log": "Access log" } diff --git a/forms/admin/users/locale/es.json b/forms/admin/users/locale/es.json index b7d55eda..646128f5 100755 --- a/forms/admin/users/locale/es.json +++ b/forms/admin/users/locale/es.json @@ -1,12 +1,7 @@ { - "UserManagement": "Gestión de usuarios" - - ,"UserName:": "Nombre de usuario:" - - ,"UserNumber": "Nº usuario" - ,"UserName": "Nombre de usuario" - ,"Alias": "Alias" + "User management": "Gestión de usuarios" - ,"AccessAsUser": "Suplantar usuario" - ,"AccessLog": "Registro de accesos" + ,"Disabled": "Desactivado" + ,"Impersonate user": "Suplantar usuario" + ,"Access log": "Registro de accesos" } diff --git a/forms/admin/users/locale/fr.json b/forms/admin/users/locale/fr.json index 60f93d58..70ebff1b 100755 --- a/forms/admin/users/locale/fr.json +++ b/forms/admin/users/locale/fr.json @@ -1,12 +1,7 @@ { - "UserManagement": "Gestion des utilisateurs" - - ,"UserName:": "Nom d'utilisateur:" - - ,"UserNumber": "Numéro utilisateurs" - ,"UserName": "Nom d'utilisateur" - ,"Alias": "Alias" - - ,"AccessAsUser": "Accès utilisateur" - ,"AccessLog": "Journal des accès" + "User management": "Gestion des utilisateurs" + + ,"Disabled": "Désactivé" + ,"Impersonate user": "Accès utilisateur" + ,"Access log": "Journal des accès" } diff --git a/forms/admin/users/locale/mn.json b/forms/admin/users/locale/mn.json index 58aa9663..541b4619 100755 --- a/forms/admin/users/locale/mn.json +++ b/forms/admin/users/locale/mn.json @@ -1,12 +1,7 @@ { - "UserManagement": "User management" - - ,"UserName:": "Username:" - - ,"UserNumber": "User number" - ,"UserName": "Username" - ,"Alias": "Alias" + "User management": "User management" - ,"AccessAsUser": "Impersonate user" - ,"AccessLog": "Access log" + ,"Disabled": "Disabled" + ,"Impersonate user": "Impersonate user" + ,"Access log": "Access log" } diff --git a/forms/admin/users/locale/pt.json b/forms/admin/users/locale/pt.json index d716ced1..b029f115 100644 --- a/forms/admin/users/locale/pt.json +++ b/forms/admin/users/locale/pt.json @@ -1,12 +1,7 @@ { - "UserManagement": "Gestão de usuarios" - - ,"UserName:": "Nome de usuario:" - - ,"UserNumber": "Nº usuario" - ,"UserName": "Nome de usuario" - ,"Alias": "Alias" + "User management": "Gestão de usuarios" - ,"AccessAsUser": "Suplantar usuario" - ,"AccessLog": "Registro de acessos" + ,"Disabled": "Desativado" + ,"Impersonate user": "Suplantar usuario" + ,"Access log": "Registro de acessos" } diff --git a/forms/admin/users/style.css b/forms/admin/users/style.css index 5dc8d8c8..30caf897 100644 --- a/forms/admin/users/style.css +++ b/forms/admin/users/style.css @@ -25,6 +25,16 @@ { font-size: 1.2em; } +.users-box > .disabled +{ + float: right; + color: white; + background-color: #F66; + border-radius: .2em; + padding: .2em; + margin: .3em; + font-size: .8em; +} /* Topbar */ diff --git a/forms/admin/users/ui.xml b/forms/admin/users/ui.xml index 0183dfaf..088cac9d 100755 --- a/forms/admin/users/ui.xml +++ b/forms/admin/users/ui.xml @@ -4,7 +4,7 @@

-

UserManagement

+

User management

- + SELECT u.id, u.name, u.nickname, u.active @@ -33,20 +33,24 @@ - + + + Disabled +

- - + @ -

diff --git a/forms/admin/users/users.js b/forms/admin/users/users.js index 93b40407..28076b39 100644 --- a/forms/admin/users/users.js +++ b/forms/admin/users/users.js @@ -11,15 +11,19 @@ Hedera.Users = new Class }); } + ,rendererFunc: function (scope, form) + { + var isEnabled = form.get('active') + scope.$('disabled').style.display = isEnabled ? + 'none' : 'block'; + scope.$('impersonate').node.style.display = isEnabled ? + 'block' : 'none'; + } + ,onChangeUserClick: function (button, form) { - 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')); + this.gui.supplantUser (form.get ('name'), + this.onUserSupplant.bind (this)); } ,onUserSupplant: function (userName)