fix(filter): search limit by date range was not being applied
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
Refs: 3059
This commit is contained in:
parent
d41378a532
commit
08cba0a9c8
|
@ -115,9 +115,8 @@ module.exports = Self => {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
const collegues = worker.collegues() || [];
|
const collegues = worker.collegues() || [];
|
||||||
collegues.forEach(collegue => {
|
for (let collegue of collegues)
|
||||||
teamMembersId.push(collegue.collegueFk);
|
teamMembersId.push(collegue.collegueFk);
|
||||||
});
|
|
||||||
|
|
||||||
if (teamMembersId.length == 0)
|
if (teamMembersId.length == 0)
|
||||||
teamMembersId.push(userId);
|
teamMembersId.push(userId);
|
||||||
|
|
|
@ -145,9 +145,8 @@ module.exports = Self => {
|
||||||
}, myOptions);
|
}, myOptions);
|
||||||
|
|
||||||
const collegues = worker.collegues() || [];
|
const collegues = worker.collegues() || [];
|
||||||
collegues.forEach(collegue => {
|
for (let collegue of collegues)
|
||||||
teamMembersId.push(collegue.collegueFk);
|
teamMembersId.push(collegue.collegueFk);
|
||||||
});
|
|
||||||
|
|
||||||
if (teamMembersId.length == 0)
|
if (teamMembersId.length == 0)
|
||||||
teamMembersId.push(userId);
|
teamMembersId.push(userId);
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
<vn-crud-model
|
<vn-crud-model
|
||||||
vn-id="model"
|
vn-id="model"
|
||||||
|
params="::$ctrl.filterParams"
|
||||||
url="Tickets/filter"
|
url="Tickets/filter"
|
||||||
limit="20"
|
limit="20"
|
||||||
order="shippedDate DESC, shippedHour ASC, zoneLanding ASC, id">
|
order="shippedDate DESC, shippedHour ASC, zoneLanding ASC, id">
|
||||||
|
|
|
@ -5,9 +5,9 @@ export default class Ticket extends ModuleMain {
|
||||||
constructor() {
|
constructor() {
|
||||||
super();
|
super();
|
||||||
|
|
||||||
this.filterParams = {
|
this.filterParams = this.fetchParams({
|
||||||
scopeDays: 1
|
scopeDays: 1
|
||||||
};
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
fetchParams($params) {
|
fetchParams($params) {
|
||||||
|
|
Loading…
Reference in New Issue