From f0dcd47bafefb8e95cdc7222ccf848c98e0b894e Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 20 Oct 2017 19:45:11 +0200 Subject: [PATCH] Bugs solved --- forms/admin/items/ui.xml | 23 ++++++++++------------- forms/admin/users/ui.xml | 2 +- forms/ecomerce/confirm/confirm.js | 1 - forms/ecomerce/ticket/ui.xml | 2 +- js/hedera/form.js | 4 ++-- js/vn/compiler-object.js | 24 +----------------------- 6 files changed, 15 insertions(+), 41 deletions(-) diff --git a/forms/admin/items/ui.xml b/forms/admin/items/ui.xml index 062f9132..205c7920 100755 --- a/forms/admin/items/ui.xml +++ b/forms/admin/items/ui.xml @@ -3,24 +3,23 @@ _Items
- +
- - + + SELECT Id_Article, Article, Medida, Categoria, Foto FROM vn2008.Articles - WHERE Article LIKE CONCAT('%', #filter, '%') - OR Id_Article = #filter + WHERE Article LIKE CONCAT('%', #search, '%') + OR Id_Article = #search ORDER BY Article LIMIT 50

- - - + {{Article}} {{Medida}} {{Categoria}}

- + @{{Id_Article}}

- + {{Foto}}

diff --git a/forms/admin/users/ui.xml b/forms/admin/users/ui.xml index ae4eafd8..3fe27365 100755 --- a/forms/admin/users/ui.xml +++ b/forms/admin/users/ui.xml @@ -34,7 +34,7 @@ {{Cliente}}

- {{id}} - {{name}} + @{{id}} - {{name}}

diff --git a/forms/ecomerce/confirm/confirm.js b/forms/ecomerce/confirm/confirm.js index 8e168fdc..940b4da2 100644 --- a/forms/ecomerce/confirm/confirm.js +++ b/forms/ecomerce/confirm/confirm.js @@ -137,7 +137,6 @@ Hedera.Confirm = new Class ,onConfirmClick: function () { - console.log (this.$.lot.params); this.disableButtons (true); this.$.confirmQuery.execute (); } diff --git a/forms/ecomerce/ticket/ui.xml b/forms/ecomerce/ticket/ui.xml index 933b9401..0108c155 100755 --- a/forms/ecomerce/ticket/ui.xml +++ b/forms/ecomerce/ticket/ui.xml @@ -21,7 +21,7 @@

- + @

diff --git a/js/hedera/form.js b/js/hedera/form.js index bb00421d..1c3d276a 100644 --- a/js/hedera/form.js +++ b/js/hedera/form.js @@ -69,8 +69,8 @@ module.exports = new Class if (this.node) { this.gui.setForm (this.node); - this.gui.setTitle (scope.$.title); - this.gui.setActions (scope.$.actions); + this.gui.setTitle (this.$.title); + this.gui.setActions (this.$.actions); this.activate (); } diff --git a/js/vn/compiler-object.js b/js/vn/compiler-object.js index 9544c223..55693d79 100644 --- a/js/vn/compiler-object.js +++ b/js/vn/compiler-object.js @@ -153,28 +153,6 @@ module.exports = new Class attribute, node.tagName); } - ,postCompile: function (contextMap) - { - var links = this._links; - - for (var i = links.length - 1; i >= 0; i--) - { - var link = links[i]; - var context = link.context; - var contextId = contextMap[link.objectId]; - - if (contextId == undefined) - continue; - - if (link.prop) - context.objectProps[link.prop] = contextId; - else - context.childs.push (contextId); - - links.splice (i, 1); - } - } - ,addLink: function (context, prop, objectId) { this._links.push ({ @@ -206,7 +184,7 @@ module.exports = new Class var object = objects[link.context.id]; var objectRef = scope.$[link.objectId]; - if (objectRef == null) + if (objectRef === undefined) { this.showError ('Referenced unexistent object with id \'%s\'', link.objectId);