diff --git a/forms/admin/connections/ui.xml b/forms/admin/connections/ui.xml index a6f69387..46a876aa 100755 --- a/forms/admin/connections/ui.xml +++ b/forms/admin/connections/ui.xml @@ -21,7 +21,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 @@ -29,7 +29,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 @@ -45,7 +44,7 @@ on-click="onChangeUserClick"/>

- {{Cliente}} + {{nickname}}

- 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 1aac72e6..1b983b01 100644 --- a/forms/admin/users/style.css +++ b/forms/admin/users/style.css @@ -1,4 +1,12 @@ +.users ._disabled +{ + color: white; + background-color: #F66; + border-radius: .2em; + padding: .3em; + font-size: .8em; +} .action-bar .htk-search-entry { margin: .8em; diff --git a/forms/admin/users/ui.xml b/forms/admin/users/ui.xml index b765d4a7..227b5184 100755 --- a/forms/admin/users/ui.xml +++ b/forms/admin/users/ui.xml @@ -1,19 +1,18 @@

- _UserManagement + _User management

- + - SELECT u.id, u.name, c.Cliente + SELECT u.id, u.name, u.nickname, u.active 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, '%') + OR u.nickname LIKE CONCAT('%', #user, '%') OR u.id = #user ORDER BY u.name LIMIT 200 @@ -23,14 +22,18 @@ href="#!form=admin/access-log&user={{id}}" title="_AccessLog">
+ + _Disabled +

- {{Cliente}} + {{nickname}}

@{{id}} - {{name}} diff --git a/forms/admin/users/users.js b/forms/admin/users/users.js index a60c8f01..5398dd03 100644 --- a/forms/admin/users/users.js +++ b/forms/admin/users/users.js @@ -3,6 +3,15 @@ Hedera.Users = new Class ({ Extends: Hedera.Form + ,rendererFunc: function (scope, lot) + { + var isEnabled = lot.$.active; + scope.$.disabled.style.display = isEnabled ? + 'none' : 'block'; + scope.$.impersonate.node.style.display = isEnabled ? + 'block' : 'none'; + } + ,onChangeUserClick: function (button) { this.gui.supplantUser (button.value, diff --git a/forms/ecomerce/catalog/ui.xml b/forms/ecomerce/catalog/ui.xml index f0772328..9079b24c 100755 --- a/forms/ecomerce/catalog/ui.xml +++ b/forms/ecomerce/catalog/ui.xml @@ -236,6 +236,9 @@

{{card.name}}

+

+ {{card.id}} +

{{card.producer}}

diff --git a/forms/news/news/ui.xml b/forms/news/news/ui.xml index 09391e99..17d037e7 100755 --- a/forms/news/news/ui.xml +++ b/forms/news/news/ui.xml @@ -12,9 +12,9 @@
- 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 + JOIN account.user u ON u.id = n.user_id ORDER BY priority, n.date_time DESC @@ -39,7 +39,7 @@ {{title}}

- {{Cliente}} + {{nickname}}

_Priority {{priority}} diff --git a/js/hedera/gui.js b/js/hedera/gui.js index 5c43de88..23488cca 100644 --- a/js/hedera/gui.js +++ b/js/hedera/gui.js @@ -497,7 +497,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)