github-mirrors/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-04-22 04:57:07 -04:00
Code Issues Projects Releases Packages Wiki Activity

Refactor imported -> linked in server and i18n

Browse source
This commit is contained in:
Andrés Manelli 2018-05-02 15:11:26 -03:00
parent f76d8e47a8
commit 692a1bc369
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
i18n/en.i18n.json
View file

@ -137,8 +137,8 @@
"cards-count": "Cards",
"casSignIn" : "Sign In with CAS",
"cardType-card": "Card",
"cardType-importedCard": "Imported Card",
"cardType-importedBoard": "Imported Board",
"cardType-linkedCard": "Linked Card",
"cardType-linkedBoard": "Linked Board",
"change": "Change",
"change-avatar": "Change Avatar",
"change-password": "Change Password",
@ -175,7 +175,7 @@
"confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?",
"confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
"copy-card-link-to-clipboard": "Copy card link to clipboard",
"importCardPopup-title": "Import Card",
"linkCardPopup-title": "Link Card",
"searchCardPopup-title": "Search Card",
"copyCardPopup-title": "Copy Card",
"copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
@ -267,6 +267,7 @@
"headerBarCreateBoardPopup-title": "Create Board",
"home": "Home",
"import": "Import",
"link": "Link",
"import-board": "import board",
"import-board-c": "Import board",
"import-board-title-trello": "Import board from Trello",

2
server/migrations.js
View file

@ -219,7 +219,7 @@ Migrations.add('add-card-types', () => {
{ _id: card._id },
{ $set: {
type: 'cardType-card',
importedId: null } },
linkedId: null } },
noValidate
);
});

8
server/publications/boards.js
View file

@ -99,16 +99,16 @@ Meteor.publishRelations('board', function(boardId) {
// And in the meantime our code below works pretty well -- it's not even a
// hack!
this.cursor(Cards.find({ boardId }), function(cardId, card) {
if (card.type === 'cardType-importedCard') {
const impCardId = card.importedId;
if (card.type === 'cardType-linkedCard') {
const impCardId = card.linkedId;
this.cursor(Cards.find({ _id: impCardId }));
this.cursor(CardComments.find({ cardId: impCardId }));
this.cursor(Activities.find({ cardId: impCardId }));
this.cursor(Attachments.find({ cardId: impCardId }));
this.cursor(Checklists.find({ cardId: impCardId }));
this.cursor(ChecklistItems.find({ cardId: impCardId }));
} else if (card.type === 'cardType-importedBoard') {
this.cursor(Boards.find({ _id: card.importedId}));
} else if (card.type === 'cardType-linkedBoard') {
this.cursor(Boards.find({ _id: card.linkedId}));
}
this.cursor(Activities.find({ cardId }));
this.cursor(CardComments.find({ cardId }));