Beta

forms/admin/access-log/ui.xml

@@ -5,8 +5,9 @@
 	<db-form id="userForm">
 		<db-model property="model">
 			<custom>
-				SELECT u.id, u.nickname, u.email, c.phone
+				SELECT u.id, u.name user, u.nickname, u.email, c.phone, r.name role
 					FROM account.user u
+						JOIN account.role r ON r.id = u.role
 						LEFT JOIN vn.client c ON c.id = u.id 
 					WHERE u.id = #user
 			</custom>
@@ -24,10 +25,11 @@
 <div id="form" class="access-log">
 	<div class="box vn-w-xs vn-pa-lg">
 		<div class="form">
-			<p>#{{$.userForm.id}}</p>
-			<p>{{$.userForm.nickname}}</p>
-			<p>{{$.userForm.email}}</p>
-			<p>{{$.userForm.phone}}</p>
+			<h4><htk-text form="user-form" column="nickname"/></h4>
+			<p>#<htk-text form="user-form" column="id"/> - <htk-text form="user-form" column="user"/></p>
+			<p><htk-text form="user-form" column="role"/></p>
+			<p><htk-text form="user-form" column="email"/></p>
+			<p><htk-text form="user-form" column="phone"/></p>
 		</div>
 	</div>
 	<htk-repeater form-id="iter" class="box vn-w-xs htk-list vn-mt-md">

forms/ecomerce/catalog/catalog.js

@@ -295,10 +295,8 @@ Vn.Filter = new Class({
 	Extends: Htk.Field
 	,Tag: 'vn-filter'
 	,Child: 'model'
-	,Properties:
-	{
-		model:
-		{
+	,Properties: {
+		model: {
 			type: Db.Model
 			,set: function(x) {
 				x.batch = this._batch;
@@ -309,8 +307,7 @@ Vn.Filter = new Class({
 				return this._model;
 			}
 		},
-		placeholder:
-		{
+		placeholder: {
 			type: String
 			,set: function(x) {
 				this._select.placeholder = x;
@@ -320,8 +317,7 @@ Vn.Filter = new Class({
 				return this._placeholder;
 			}
 		},
-		filter:
-		{
+		filter: {
 			type: Sql.Filter
 			,set: function(x) {
 				this._filter = x;
@@ -330,7 +326,7 @@ Vn.Filter = new Class({
 			,get: function() {
 				return this._filter;
 			}
-		},
+		}
 	}
 	
 	,_valueColumnIndex: 0
@@ -432,19 +428,25 @@ Vn.Filter = new Class({
 		if (!this._label)
 			return;
 	
-		var row = -1;
+		let row = -1;
+		const model = this._model;
 
+		if (model) {
 			if (this._model.ready)
-			row = this._model.searchByIndex(this._valueColumnIndex, this._value);
+				row = model.searchByIndex(this._valueColumnIndex, this._value);
 
 			if (row != -1) {
-			var label = this._model.getByIndex(row, this._showColumnIndex);
+				var label = model.getByIndex(row, this._showColumnIndex);
 				this._label.nodeValue = label;
 				this._emptyLabel = false;
 			} else {
 				this._emptyLabel = true;
 				this._label.nodeValue = _('Loading...');
 			}
+		} else {
+			this._emptyLabel = true;
+			this._label.nodeValue = '';
+		}
 	}
 });
 

js/hedera/app.js

@@ -62,7 +62,10 @@ module.exports = new Class({
 	}
 
 	,_onConnError: function(conn, error) {
-		if (error instanceof Vn.JsonException)
+		if (error instanceof Vn.JsonException) {
+			if (error.message)
+				Htk.Toast.showError(error.message);
+			else
 				switch (error.exception) {
 				case 'BadLogin':
 					Htk.Toast.showError(_('Invalid login'));
@@ -84,7 +87,8 @@ module.exports = new Class({
 					break;
 				default:
 					Htk.Toast.showError(error.message);
-		} else if (error.statusCode)
+				}
+		} else if (error.statusCode) {
 			switch (error.statusCode) {
 			case 401:
 				Htk.Toast.showError(_('Invalid login'));
@@ -93,7 +97,7 @@ module.exports = new Class({
 			default:
 				Htk.Toast.showError(error.message);
 			}
-		else {
+		} else {
 			console.error(error);
 			this._notifyError(error);
 		}

js/hedera/gui.js

@@ -477,9 +477,8 @@ module.exports = new Class({
 			this._onUserSupplant.bind(this, callback, user));
 	}
 	
-	,_onUserSupplant: function(callback, user, supplantOk) {
-		if (!supplantOk)
-			return;
+	,_onUserSupplant: function(callback, user, supplantOk, err) {
+		if (err) throw err;
 	
 		sessionStorage.setItem('supplantUser', user);
 		this.loadMenu();

js/hedera/gui.scss

@@ -1,6 +1,9 @@
 
 @import "../htk/style/classes";
 
+$side-panel-width: 250px;
+$navbar-height: 64px;
+
 .vn-gui {
 	height: inherit;
 
@@ -16,12 +19,12 @@
 	.navbar {
 		position: fixed;
 		background-color: #1A1A1A;
-		left: 250px;
+		left: $side-panel-width;
 		top: 0;
 		right: 0;
 		z-index: 1;
 		overflow: hidden;
-		height: 64px;
+		height: $navbar-height;
 		color: white;
 		display: flex;
 		align-items: center;
@@ -48,17 +51,18 @@
 			align-items: center;
 			gap: 15px;
 			overflow: hidden;
+			padding-left: 15px;
 
 			& > .title {
-				white-space: nowrap;
 				overflow: hidden;
-				text-overflow: ellipsis;
 
 				h1 {
 					font-weight: normal;
 					font-size: 1.4em;
-					padding-left: 8px;
 					margin: 0;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+					overflow: hidden;
 				}
 			}
 		}
@@ -122,7 +126,7 @@
 		top: 0;
 		background-color: white;
 		z-index: 20;
-		width: 250px;
+		width: $side-panel-width;
 	}
 	.menu-overflow {
 		position: absolute;
@@ -135,7 +139,7 @@
 	.menu-header {
 		background-color: #1A1A1A;
 		color: white;
-		height: 64px;
+		height: $navbar-height;
 		display: flex;
 	}
 	.logo {
@@ -269,8 +273,8 @@
 	/* Body */
 
 	& > .body {
-		margin-left: 250px;
-		padding-top: 4.4em;
+		margin-left: $side-panel-width;
+		padding-top: $navbar-height;
 		height: inherit;
 		box-sizing: border-box;
 		height: inherit;

js/htk/style/components.scss

@@ -230,6 +230,7 @@ td.cell-image .htk-image {
 				margin: .1em 0;
 				text-overflow: ellipsis;
 				white-space: nowrap;
+				overflow: hidden;
 			}
 		}
 		& > .actions {

js/vn/json-connection.js

@@ -116,12 +116,12 @@ module.exports = new Class({
 			this._onUserSupplant.bind(this, callback));
 	}
 	
-	,_onUserSupplant: function(callback, json) {
+	,_onUserSupplant: function(callback, json, err) {
 		if (json)
 			this.token = json;
 
 		if (callback)
-			callback(json != null);
+			callback(err == null, err);
 	}
 
 	/**
@@ -302,7 +302,6 @@ module.exports = new Class({
 			data = null;
 			error = e;
 		}
-
 		if (callback)
 		try {
 			callback(data, error);