Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-16 23:40:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Removing Debug Lines, correcting behavior, caching las valide filter, and adding description

Browse source
This commit is contained in:
IgnatzHome 2018-05-20 14:53:00 +02:00
parent 256ca129f0
commit dd7c9997a9
4 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
client/lib/filter.js
View file

@ -86,6 +86,7 @@ class AdvancedFilter {
constructor() {
this._dep = new Tracker.Dependency();
this._filter = '';
this._lastValide={};
}
set(str)
@ -96,6 +97,7 @@ class AdvancedFilter {
reset() {
this._filter = '';
this._lastValide={};
this._dep.changed();
}
@ -147,26 +149,23 @@ class AdvancedFilter {
_fieldNameToId(field)
{
console.log(`searching: ${field}`);
const found = CustomFields.findOne({'name':field});
console.log(found);
return found._id;
}
_arrayToSelector(commands)
{
console.log('Parts: ', JSON.stringify(commands));
try {
//let changed = false;
this._processSubCommands(commands);
}
catch (e){return { $in: [] };}
catch (e){return this._lastValide;}
this._lastValide = {$or: commands};
return {$or: commands};
}
_processSubCommands(commands)
{
console.log('SubCommands: ', JSON.stringify(commands));
const subcommands = [];
let level = 0;
let start = -1;
@ -205,16 +204,13 @@ class AdvancedFilter {
if (start !== -1)
{
this._processSubCommands(subcommands);
console.log ('subcommands: ', subcommands.length);
if (subcommands.length === 1)
commands.splice(start, 0, subcommands[0]);
else
commands.splice(start, 0, subcommands);
}
this._processConditions(commands);
console.log('Conditions: ', JSON.stringify(commands));
this._processLogicalOperators(commands);
console.log('Operator: ', JSON.stringify(commands));
}
_processConditions(commands)
@ -458,6 +454,7 @@ Filter = {
const filter = this[fieldName];
filter.reset();
});
this.advanced.reset();
this.resetExceptions();
},