verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 58 Releases Wiki Activity

Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details

This commit is contained in:
Gerard 2019-03-11 08:15:00 +01:00
parent 3afedbd89b 63787a7beb
commit 562403cd0a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/ticket/front/index/index.js
View File

@ -12,7 +12,6 @@ export default class Controller {
this.goToTurns('ticket.weekly');
}, name: 'Turns', always: true},
];
this.filter = {};
if (!$stateParams.q) {
let today = new Date();
@ -25,7 +24,7 @@ export default class Controller {
sixDays.setDate(today.getDate() + 6);
sixDays.setHours(23, 59, 59, 999);
this.filter = Object.assign(this.filter, {myTeam: true, from: today, to: sixDays});
this.filter = Object.assign({}, {myTeam: true, from: today, to: sixDays});
}
}
@ -35,6 +34,7 @@ export default class Controller {
}
onSearch(params) {
console.log(params);
if (params)
this.$.model.applyFilter(null, params);
else