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

Remove added backticks from regex

Browse source
This commit is contained in:
John R. Supplee 2021-01-28 23:33:18 +02:00
parent 010a1d07d9
commit 6ba4da9711
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
client/components/main/globalSearch.js
View file

@ -190,10 +190,10 @@ BlazeComponent.extendComponent({
this.searching.set(true); this.searching.set(true);
const reOperator1 = `/^((?<operator>[\p{Letter}\p{Mark}]+):|(?<abbrev>[#@]))(?<value>[\p{Letter}\p{Mark}]+)(\s+|$)/iu`; const reOperator1 = /^((?<operator>[\p{Letter}\p{Mark}]+):|(?<abbrev>[#@]))(?<value>[\p{Letter}\p{Mark}]+)(\s+|$)/iu;
const reOperator2 = `/^((?<operator>[\p{Letter}\p{Mark}]+):|(?<abbrev>[#@]))(?<quote>["']*)(?<value>.*?)\k<quote>(\s+|$)/iu`; const reOperator2 = /^((?<operator>[\p{Letter}\p{Mark}]+):|(?<abbrev>[#@]))(?<quote>["']*)(?<value>.*?)\k<quote>(\s+|$)/iu;
const reText = `/^(?<text>\S+)(\s+|$)/u`; const reText = /^(?<text>\S+)(\s+|$)/u;
const reQuotedText = `/^(?<quote>["'])(?<text>[\w\p{L}]+)\k<quote>(\s+|$)/u`; const reQuotedText = /^(?<quote>["'])(?<text>[\w\p{L}]+)\k<quote>(\s+|$)/u;
const operators = { const operators = {
'operator-board': 'boards', 'operator-board': 'boards',

4
models/boards.js
View file

@ -1263,12 +1263,12 @@ function boardRemover(userId, doc) {
} }
Boards.uniqueTitle = title => { Boards.uniqueTitle = title => {
const m = title.match(`/^(?<title>.*?)\s*(\[(?<num>\d+)]\s*$|\s*$)/`); const m = title.match(/^(?<title>.*?)\s*(\[(?<num>\d+)]\s*$|\s*$)/);
const base = escapeForRegex(m.groups.title); const base = escapeForRegex(m.groups.title);
let num = 0; let num = 0;
Boards.find({ title: new RegExp(`^${base}\\s*\\[\\d+]\\s*$`) }).forEach( Boards.find({ title: new RegExp(`^${base}\\s*\\[\\d+]\\s*$`) }).forEach(
board => { board => {
const m = board.title.match(`/^(?<title>.*?)\s*\[(?<num>\d+)]\s*$/`); const m = board.title.match(/^(?<title>.*?)\s*\[(?<num>\d+)]\s*$/);
if (m) { if (m) {
const n = parseInt(m.groups.num, 10); const n = parseInt(m.groups.num, 10);
num = num < n ? n : num; num = num < n ? n : num;