diff options
| author | Béranger Campardou <b.campardou@gmail.com> | 2017-01-20 11:09:34 +0100 |
|---|---|---|
| committer | Béranger Campardou <b.campardou@gmail.com> | 2017-01-20 11:09:34 +0100 |
| commit | 23cb98bb825a2e210a8d314ecaba228ed7d332f2 (patch) | |
| tree | 2dc0e85eddf912581ebe57b748e94d8373f65c81 | |
| parent | 1169c0d7dc8184ed4db615673844024bbbfd4e66 (diff) | |
| download | wekan-23cb98bb825a2e210a8d314ecaba228ed7d332f2.tar.gz wekan-23cb98bb825a2e210a8d314ecaba228ed7d332f2.tar.bz2 wekan-23cb98bb825a2e210a8d314ecaba228ed7d332f2.zip | |
Fix activity message for list deletion
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | client/components/activities/activities.jade | 3 | ||||
| -rw-r--r-- | client/components/lists/listHeader.js | 1 | ||||
| -rw-r--r-- | i18n/fr.i18n.json | 2 | ||||
| -rw-r--r-- | models/lists.js | 11 |
5 files changed, 17 insertions, 1 deletions
@@ -4,3 +4,4 @@ *.sublime-workspace tmp/ node_modules/ +.vscode/ diff --git a/client/components/activities/activities.jade b/client/components/activities/activities.jade index 9ff73864..b47dac22 100644 --- a/client/components/activities/activities.jade +++ b/client/components/activities/activities.jade @@ -41,6 +41,9 @@ template(name="boardActivities") if($eq activityType 'createList') | {{_ 'activity-added' list.title boardLabel}}. + if($eq activityType 'removeList') + | {{_ 'activity-removed' title boardLabel}}. + if($eq activityType 'importBoard') | {{{_ 'activity-imported-board' boardLabel sourceLink}}}. diff --git a/client/components/lists/listHeader.js b/client/components/lists/listHeader.js index 65a464bb..f352022d 100644 --- a/client/components/lists/listHeader.js +++ b/client/components/lists/listHeader.js @@ -64,5 +64,6 @@ Template.listActionPopup.events({ const currentList = this; evt.preventDefault(); Lists.remove(currentList._id); + Popup.close(); }, }); diff --git a/i18n/fr.i18n.json b/i18n/fr.i18n.json index 8c228105..4304f15f 100644 --- a/i18n/fr.i18n.json +++ b/i18n/fr.i18n.json @@ -33,7 +33,7 @@ "activity-joined": "a rejoint %s", "activity-moved": "a déplacé %s depuis %s vers %s", "activity-on": "sur %s", - "activity-removed": "a supprimé %s vers %s", + "activity-removed": "a supprimé %s de %s", "activity-sent": "a envoyé %s vers %s", "activity-unjoined": "a quitté %s", "add": "Ajouter", diff --git a/models/lists.js b/models/lists.js index 9ae2e4f7..3c50fba0 100644 --- a/models/lists.js +++ b/models/lists.js @@ -105,6 +105,17 @@ if (Meteor.isServer) { }); }); + Lists.before.remove((userId, doc) => { + Activities.insert({ + userId, + type: 'list', + activityType: 'removeList', + boardId: doc.boardId, + listId: doc._id, + title: doc.title + }); + }); + Lists.after.update((userId, doc) => { if (doc.archived) { Activities.insert({ |