Merge pull request 'Search limit by date range was not being applied' (#741) from 3059-ticket_index_filter into dev
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #741 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
This commit is contained in:
commit
3118b104eb
|
@ -115,9 +115,8 @@ module.exports = Self => {
|
|||
}
|
||||
});
|
||||
const collegues = worker.collegues() || [];
|
||||
collegues.forEach(collegue => {
|
||||
for (let collegue of collegues)
|
||||
teamMembersId.push(collegue.collegueFk);
|
||||
});
|
||||
|
||||
if (teamMembersId.length == 0)
|
||||
teamMembersId.push(userId);
|
||||
|
|
|
@ -145,9 +145,8 @@ module.exports = Self => {
|
|||
}, myOptions);
|
||||
|
||||
const collegues = worker.collegues() || [];
|
||||
collegues.forEach(collegue => {
|
||||
for (let collegue of collegues)
|
||||
teamMembersId.push(collegue.collegueFk);
|
||||
});
|
||||
|
||||
if (teamMembersId.length == 0)
|
||||
teamMembersId.push(userId);
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
<vn-crud-model
|
||||
vn-id="model"
|
||||
params="::$ctrl.filterParams"
|
||||
url="Tickets/filter"
|
||||
limit="20"
|
||||
order="shippedDate DESC, shippedHour ASC, zoneLanding ASC, id">
|
||||
|
|
|
@ -5,9 +5,9 @@ export default class Ticket extends ModuleMain {
|
|||
constructor() {
|
||||
super();
|
||||
|
||||
this.filterParams = {
|
||||
this.filterParams = this.fetchParams({
|
||||
scopeDays: 1
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
fetchParams($params) {
|
||||
|
|
Loading…
Reference in New Issue