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

Fixed "Search All Boards" instructions are gone.

Browse source 
Thanks to ClaudiaK21 and xet7 !

Fixes #3882
This commit is contained in:
Lauri Ojansivu 2021-06-29 13:38:57 +03:00
parent a0945d2a2e
commit 30ffcc9246
2 changed files with 45 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -158,40 +158,42 @@ class GlobalSearchComponent extends CardSearchPagedComponent {
['# ', 'globalSearch-instructions-heading'], ['# ', 'globalSearch-instructions-heading'],
['\n', 'globalSearch-instructions-description'], ['\n', 'globalSearch-instructions-description'],
['\n\n', 'globalSearch-instructions-operators'], ['\n\n', 'globalSearch-instructions-operators'],
['\n* ', 'globalSearch-instructions-operator-board'], ['\n- ', 'globalSearch-instructions-operator-board'],
['\n* ', 'globalSearch-instructions-operator-list'], ['\n- ', 'globalSearch-instructions-operator-list'],
['\n* ', 'globalSearch-instructions-operator-swimlane'], ['\n- ', 'globalSearch-instructions-operator-swimlane'],
['\n* ', 'globalSearch-instructions-operator-comment'], ['\n- ', 'globalSearch-instructions-operator-comment'],
['\n* ', 'globalSearch-instructions-operator-label'], ['\n- ', 'globalSearch-instructions-operator-label'],
['\n* ', 'globalSearch-instructions-operator-hash'], ['\n- ', 'globalSearch-instructions-operator-hash'],
['\n* ', 'globalSearch-instructions-operator-user'], ['\n- ', 'globalSearch-instructions-operator-user'],
['\n* ', 'globalSearch-instructions-operator-at'], ['\n- ', 'globalSearch-instructions-operator-at'],
['\n* ', 'globalSearch-instructions-operator-member'], ['\n- ', 'globalSearch-instructions-operator-member'],
['\n* ', 'globalSearch-instructions-operator-assignee'], ['\n- ', 'globalSearch-instructions-operator-assignee'],
['\n* ', 'globalSearch-instructions-operator-creator'], ['\n- ', 'globalSearch-instructions-operator-creator'],
['\n* ', 'globalSearch-instructions-operator-due'], ['\n- ', 'globalSearch-instructions-operator-due'],
['\n* ', 'globalSearch-instructions-operator-created'], ['\n- ', 'globalSearch-instructions-operator-created'],
['\n* ', 'globalSearch-instructions-operator-modified'], ['\n- ', 'globalSearch-instructions-operator-modified'],
['\n* ', 'globalSearch-instructions-operator-status'], ['\n- ', 'globalSearch-instructions-operator-status'],
['\n * ', 'globalSearch-instructions-status-archived'], ['\n - ', 'globalSearch-instructions-status-archived'],
['\n * ', 'globalSearch-instructions-status-public'], ['\n - ', 'globalSearch-instructions-status-public'],
['\n * ', 'globalSearch-instructions-status-private'], ['\n - ', 'globalSearch-instructions-status-private'],
['\n * ', 'globalSearch-instructions-status-all'], ['\n - ', 'globalSearch-instructions-status-all'],
['\n * ', 'globalSearch-instructions-status-ended'], ['\n - ', 'globalSearch-instructions-status-ended'],
['\n* ', 'globalSearch-instructions-operator-has'], ['\n- ', 'globalSearch-instructions-operator-has'],
['\n* ', 'globalSearch-instructions-operator-sort'], ['\n- ', 'globalSearch-instructions-operator-sort'],
['\n* ', 'globalSearch-instructions-operator-limit'], ['\n- ', 'globalSearch-instructions-operator-limit'],
['\n## ', 'heading-notes'], ['\n## ', 'heading-notes'],
['\n* ', 'globalSearch-instructions-notes-1'], ['\n- ', 'globalSearch-instructions-notes-1'],
['\n* ', 'globalSearch-instructions-notes-2'], ['\n- ', 'globalSearch-instructions-notes-2'],
['\n* ', 'globalSearch-instructions-notes-3'], ['\n- ', 'globalSearch-instructions-notes-3'],
['\n* ', 'globalSearch-instructions-notes-3-2'], ['\n- ', 'globalSearch-instructions-notes-3-2'],
['\n* ', 'globalSearch-instructions-notes-4'], ['\n- ', 'globalSearch-instructions-notes-4'],
['\n* ', 'globalSearch-instructions-notes-5'], ['\n- ', 'globalSearch-instructions-notes-5'],
].forEach(([prefix, instruction]) => { ].forEach(([prefix, instruction]) => {
text += `${prefix}${TAPi18n.__(instruction, tags)}`; text += `${prefix}${TAPi18n.__(instruction, tags)}`
// Replace *<text>* with `<text>` so markdown shows correctly
.replace(/\*\</, '`<')
.replace(/\>\*/, '\>\`')
}); });
return text; return text;
} }

19
models/boards.js
View file

@ -1422,13 +1422,18 @@ if (Meteor.isServer) {
myLabelNames() { myLabelNames() {
let names = []; let names = [];
Boards.userBoards(Meteor.userId()).forEach(board => { Boards.userBoards(Meteor.userId()).forEach(board => {
names = names.concat( // Only return labels when they exist.
board.labels if (board.labels !== undefined) {
.filter(label => !!label.name) names = names.concat(
.map(label => { board.labels
return label.name; .filter(label => !!label.name)
}), .map(label => {
); return label.name;
}),
);
} else {
return [];
}
}); });
return _.uniq(names).sort(); return _.uniq(names).sort();
}, },