wbuezas
/
hedera-web-mindshore
forked from verdnatura/hedera-web
0
1
Fork 0
Code Pull Requests Activity

Prueba git stash

This commit is contained in:
Juan Ferrer Toribio 2015-09-28 17:21:37 +02:00
parent 56d384779a
commit fd75840c82
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
web/forms/ecomerce/catalog/catalog.js
View File

@ -56,7 +56,8 @@ Vn.Catalog = new Class
this.popup = new Htk.Popup (); this.popup = new Htk.Popup ();
this.popup.setChildNode (this.$('lots-popup')); this.popup.setChildNode (this.$('lots-popup'));
this.$('items-model').setInfo ('a', 'Articles', 'vn2008', ['Id_Article']);
this.setView ('GRID'); this.setView ('GRID');
} }
@ -349,7 +350,9 @@ Vn.Catalog = new Class
{ {
console.debug ('Select clicked!'); console.debug ('Select clicked!');
console.debug (select, e); console.debug (select, e);
select.model.refresh ();
if (select.model.status === Db.Model.Status.CLEAN)
select.model.refresh ();
} }
}); });

5
web/forms/ecomerce/catalog/ui.xml
View File

@ -29,7 +29,7 @@
SELECT Id_Article item_id FROM vn2008.Articles SELECT Id_Article item_id FROM vn2008.Articles
WHERE #filter; WHERE #filter;
CALL bionic_calc (); CALL bionic_calc ();
SELECT t.item_id, t.available, t.price, p.producer, SELECT a.Id_Article, t.available, t.price, p.producer,
a.Foto, a.Article, a.Categoria, a.Medida, a.Tallos, a.Color, o.Abreviatura a.Foto, a.Article, a.Categoria, a.Medida, a.Tallos, a.Color, o.Abreviatura
FROM tmp.bionic_item t FROM tmp.bionic_item t
JOIN vn2008.Articles a ON a.Id_Article = t.item_id JOIN vn2008.Articles a ON a.Id_Article = t.item_id
@ -202,7 +202,8 @@
</option> </option>
</select> </select>
<htk-combo placeholder="_Realm" on-click="onSelectClick"> <htk-combo placeholder="_Realm" on-click="onSelectClick">
<db-model property="model"> <db-model property="model" result-index="1" auto-load="false">
SELECT SLEEP(2);
SELECT id, reino, color FROM vn2008.reinos SELECT id, reino, color FROM vn2008.reinos
WHERE display != FALSE ORDER BY reino WHERE display != FALSE ORDER BY reino
</db-model> </db-model>

11
web/js/db/model.js
View File

@ -265,10 +265,13 @@ Db.Model.implement
this._conn.execStmt (this._stmt, this._selectDone.bind (this), this._batch); this._conn.execStmt (this._stmt, this._selectDone.bind (this), this._batch);
} }
else else
{ this.clean ();
this._cleanData (); }
this._setStatus (Db.Model.Status.CLEAN);
} ,clean: function ()
{
this._cleanData ();
this._setStatus (Db.Model.Status.CLEAN);
} }
,_selectDone: function (resultSet) ,_selectDone: function (resultSet)