Using user.nickname instead of client.alias in some forms
This commit is contained in:
parent
884653412b
commit
79b949f86f
|
@ -1,4 +1,4 @@
|
|||
hedera-web (1.405.14) stable; urgency=low
|
||||
hedera-web (1.405.15) stable; urgency=low
|
||||
|
||||
* Initial Release.
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
<htk-repeater form-id="iter">
|
||||
<db-model property="model" id="sessions" on-status-changed="onModelStatusChange">
|
||||
<custom>
|
||||
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
|
||||
</custom>
|
||||
</db-model>
|
||||
|
@ -49,7 +48,7 @@
|
|||
icon="gnome"
|
||||
on-click="onAccessLogClick"/>
|
||||
<p class="important">
|
||||
<htk-text form="iter" column="Cliente"/>
|
||||
<htk-text form="iter" column="nickname"/>
|
||||
</p>
|
||||
<p>
|
||||
<htk-text form="iter" column="stamp" format="%a, %T"/> -
|
||||
|
|
|
@ -15,13 +15,12 @@
|
|||
<htk-repeater form-id="iter">
|
||||
<db-model property="model">
|
||||
<custom>
|
||||
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
|
||||
</custom>
|
||||
<sql-batch property="batch">
|
||||
<custom>
|
||||
|
@ -44,7 +43,7 @@
|
|||
icon="gnome"
|
||||
on-click="onAccessLogClick"/>
|
||||
<p class="important">
|
||||
<htk-text form="iter" column="Cliente"/>
|
||||
<htk-text form="iter" column="nickname"/>
|
||||
</p>
|
||||
<p>
|
||||
<htk-text form="iter" column="id"/> -
|
||||
|
|
|
@ -13,10 +13,10 @@
|
|||
<htk-repeater form-id="iter">
|
||||
<db-model property="model" id="news-model" updatable="true">
|
||||
<custom>
|
||||
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
|
||||
</custom>
|
||||
</db-model>
|
||||
<custom>
|
||||
|
@ -46,7 +46,7 @@
|
|||
<htk-text form="iter" column="title"/>
|
||||
</p>
|
||||
<p>
|
||||
<htk-text form="iter" column="Cliente"/>
|
||||
<htk-text form="iter" column="nickname"/>
|
||||
</p>
|
||||
<p>
|
||||
<t>Priority</t>
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue