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

Avoid importing imported cards or boards

Browse source
This commit is contained in:
Andrés Manelli 2018-04-16 16:48:54 -03:00
parent 64367a01dd
commit a93de07fb9
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
client/components/lists/listBody.js
View file

@ -337,6 +337,7 @@ BlazeComponent.extendComponent({
swimlaneId: this.selectedSwimlaneId.get(), swimlaneId: this.selectedSwimlaneId.get(),
listId: this.selectedListId.get(), listId: this.selectedListId.get(),
archived: false, archived: false,
importedId: null,
}); });
}, },
@ -436,7 +437,7 @@ BlazeComponent.extendComponent({
results() { results() {
const board = Boards.findOne(this.selectedBoardId.get()); const board = Boards.findOne(this.selectedBoardId.get());
return board.searchCards(this.term.get()); return board.searchCards(this.term.get(), true);
}, },
events() { events() {

12
models/boards.js
View file

@ -298,22 +298,22 @@ Boards.helpers({
return _id; return _id;
}, },
searchCards(term) { searchCards(term, excludeImported) {
check(term, Match.OneOf(String, null, undefined)); check(term, Match.OneOf(String, null, undefined));
let query = { boardId: this._id }; let query = { boardId: this._id };
if (excludeImported) {
query.importedId = null;
}
const projection = { limit: 10, sort: { createdAt: -1 } }; const projection = { limit: 10, sort: { createdAt: -1 } };
if (term) { if (term) {
const regex = new RegExp(term, 'i'); const regex = new RegExp(term, 'i');
query = { query.$or = [
boardId: this._id,
$or: [
{ title: regex }, { title: regex },
{ description: regex }, { description: regex },
], ];
};
} }
return Cards.find(query, projection); return Cards.find(query, projection);