Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-01-26 19:26:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'feature-custom-fields' of https://github.com/feuerball11/wekan into feuerball11-feature-custom-fields

Browse source
This commit is contained in:
Lauri Ojansivu 2018-06-14 22:51:43 +03:00
commit 3e686e4379
2 changed files with 40 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

44
client/lib/filter.js
View file

@ -109,12 +109,20 @@ class AdvancedFilter {
const commands = []; const commands = [];
let current = ''; let current = '';
let string = false; let string = false;
let regex = false;
let wasString = false; let wasString = false;
let ignore = false; let ignore = false;
for (let i = 0; i < this._filter.length; i++) { for (let i = 0; i < this._filter.length; i++) {
const char = this._filter.charAt(i); const char = this._filter.charAt(i);
if (ignore) { if (ignore) {
ignore = false; ignore = false;
current += char;
continue;
}
if (char === '/'){
string = !string;
if (string) regex = true;
current += char;
continue; continue;
} }
if (char === '\'') { if (char === '\'') {
@ -122,12 +130,12 @@ class AdvancedFilter {
if (string) wasString = true; if (string) wasString = true;
continue; continue;
} }
if (char === '\\') { if (char === '\\' && !string) {
ignore = true; ignore = true;
continue; continue;
} }
if (char === ' ' && !string) { if (char === ' ' && !string) {
commands.push({ 'cmd': current, 'string': wasString }); commands.push({ 'cmd': current, 'string': wasString, regex});
wasString = false; wasString = false;
current = ''; current = '';
continue; continue;
@ -135,7 +143,7 @@ class AdvancedFilter {
current += char; current += char;
} }
if (current !== '') { if (current !== '') {
commands.push({ 'cmd': current, 'string': wasString }); commands.push({ 'cmd': current, 'string': wasString, regex});
} }
return commands; return commands;
} }
@ -224,7 +232,20 @@ class AdvancedFilter {
{ {
const field = commands[i - 1].cmd; const field = commands[i - 1].cmd;
const str = commands[i + 1].cmd; const str = commands[i + 1].cmd;
commands[i] = { 'customFields._id': this._fieldNameToId(field), 'customFields.value': {$in: [this._fieldValueToId(field, str), parseInt(str, 10)]} }; if (commands[i + 1].regex)
{
const match = str.match(new RegExp('^/(.*?)/([gimy]*)$'));
let regex = null;
if (match.length > 2)
regex = new RegExp(match[1], match[2]);
else
regex = new RegExp(match[1]);
commands[i] = { 'customFields._id': this._fieldNameToId(field), 'customFields.value': regex };
}
else
{
commands[i] = { 'customFields._id': this._fieldNameToId(field), 'customFields.value': {$in: [this._fieldValueToId(field, str), parseInt(str, 10)]} };
}
commands.splice(i - 1, 1); commands.splice(i - 1, 1);
commands.splice(i, 1); commands.splice(i, 1);
//changed = true; //changed = true;
@ -236,7 +257,20 @@ class AdvancedFilter {
{ {
const field = commands[i - 1].cmd; const field = commands[i - 1].cmd;
const str = commands[i + 1].cmd; const str = commands[i + 1].cmd;
commands[i] = { 'customFields._id': this._fieldNameToId(field), 'customFields.value': { $not: {$in: [this._fieldValueToId(field, str), parseInt(str, 10)]} } }; if (commands[i + 1].regex)
{
const match = str.match(new RegExp('^/(.*?)/([gimy]*)$'));
let regex = null;
if (match.length > 2)
regex = new RegExp(match[1], match[2]);
else
regex = new RegExp(match[1]);
commands[i] = { 'customFields._id': this._fieldNameToId(field), 'customFields.value': { $not: regex } };
}
else
{
commands[i] = { 'customFields._id': this._fieldNameToId(field), 'customFields.value': { $not: {$in: [this._fieldValueToId(field, str), parseInt(str, 10)]} } };
}
commands.splice(i - 1, 1); commands.splice(i - 1, 1);
commands.splice(i, 1); commands.splice(i, 1);
//changed = true; //changed = true;

2
i18n/en.i18n.json
View file

@ -247,7 +247,7 @@
"filter-on-desc": "You are filtering cards on this board. Click here to edit filter.", "filter-on-desc": "You are filtering cards on this board. Click here to edit filter.",
"filter-to-selection": "Filter to selection", "filter-to-selection": "Filter to selection",
"advanced-filter-label": "Advanced Filter", "advanced-filter-label": "Advanced Filter",
"advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. Also you can combine multiple conditions. For Example: F1 == V1 || F1 = V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 and ( F2 == V2 || F2 == V3 )", "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. For single controll characters (' \\/) to be skipped, you can use \\. For example: Field1 = I\\'m. Also you can combine multiple conditions. For Example: F1 == V1 || F1 = V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 and ( F2 == V2 || F2 == V3 ). Also you can search text fields using regex: F1 == /Tes.*/i ",
"fullname": "Full Name", "fullname": "Full Name",
"header-logo-title": "Go back to your boards page.", "header-logo-title": "Go back to your boards page.",
"hide-system-messages": "Hide system messages", "hide-system-messages": "Hide system messages",