Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev

2019-02-28 10:17:28 +01:00 · 2019-02-28 10:17:28 +01:00 · d19d360ca6
parent d336fd0eb1 624733dcfb
commit d19d360ca6
2 changed files with 2 additions and 2 deletions
--- a/modules/client/back/methods/address/specs/createDefaultAddress.spec.js
+++ b/modules/client/back/methods/address/specs/createDefaultAddress.spec.js
@ -1,6 +1,6 @@
 const app = require('vn-loopback/server/server');

-fdescribe('Address createDefaultAddress', () => {
+describe('Address createDefaultAddress', () => {
    let address;
    let client;

--- a/modules/ticket/front/index/index.html
+++ b/modules/ticket/front/index/index.html
@ -3,7 +3,7 @@
    url="/ticket/api/Tickets/filter"
    limit="20"
    data="tickets"
-    order="shipped DESC"
+    order="shipped DESC, clientFk"
    auto-load="false">
 </vn-crud-model>
 <div class="content-block">