new(admin.gbapp): Remove /publish confirmation.
This commit is contained in:
parent
2c6f67af37
commit
d48cb03c32
2 changed files with 19 additions and 1 deletions
|
@ -241,6 +241,7 @@ export class GBVMService extends GBService {
|
||||||
let page = null;
|
let page = null;
|
||||||
let files = [];
|
let files = [];
|
||||||
let col = 1;
|
let col = 1;
|
||||||
|
let index = 1
|
||||||
|
|
||||||
// Transfers NLP auto variables into global object.
|
// Transfers NLP auto variables into global object.
|
||||||
|
|
||||||
|
|
|
@ -901,7 +901,7 @@ export class SystemKeywords {
|
||||||
|
|
||||||
let getFilter = async text => {
|
let getFilter = async text => {
|
||||||
let filter;
|
let filter;
|
||||||
const operators = [/\<\=/, /\>\=/, /\</, /\>/, /\bnot in\b/, /\bin\b/, /\=/];
|
const operators = [/\<\=/, /\<\>/, /\>\=/, /\</, /\>/, /\bnot in\b/, /\bin\b/, /\=/];
|
||||||
let done = false;
|
let done = false;
|
||||||
await CollectionUtil.asyncForEach(operators, async op => {
|
await CollectionUtil.asyncForEach(operators, async op => {
|
||||||
var re = new RegExp(op, 'gi');
|
var re = new RegExp(op, 'gi');
|
||||||
|
@ -993,9 +993,15 @@ export class SystemKeywords {
|
||||||
if (user && params && params.wholeWord) {
|
if (user && params && params.wholeWord) {
|
||||||
wholeWord = params.wholeWord;
|
wholeWord = params.wholeWord;
|
||||||
}
|
}
|
||||||
|
if (!result)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
switch (filter.dataType) {
|
switch (filter.dataType) {
|
||||||
case 'string':
|
case 'string':
|
||||||
|
|
||||||
|
|
||||||
const v1 = GBConversationalService.removeDiacritics(result.toLowerCase().trim());
|
const v1 = GBConversationalService.removeDiacritics(result.toLowerCase().trim());
|
||||||
const v2 = GBConversationalService.removeDiacritics(filter.value.toLowerCase().trim());
|
const v2 = GBConversationalService.removeDiacritics(filter.value.toLowerCase().trim());
|
||||||
|
|
||||||
|
@ -1011,6 +1017,17 @@ export class SystemKeywords {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case '<>':
|
||||||
|
if (wholeWord) {
|
||||||
|
if (v1 !== v2) {
|
||||||
|
filterAcceptCount++;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (v1.indexOf(v2) === -1) {
|
||||||
|
filterAcceptCount++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
case 'not in':
|
case 'not in':
|
||||||
if (wholeWord) {
|
if (wholeWord) {
|
||||||
if (v1 !== v2) {
|
if (v1 !== v2) {
|
||||||
|
|
Loading…
Add table
Reference in a new issue