瀏覽代碼

Fix activity message for list deletion

Béranger Campardou 8 年之前
父節點
當前提交
23cb98bb82
共有 5 個文件被更改,包括 17 次插入1 次删除
  1. 1 0
      .gitignore
  2. 3 0
      client/components/activities/activities.jade
  3. 1 0
      client/components/lists/listHeader.js
  4. 1 1
      i18n/fr.i18n.json
  5. 11 0
      models/lists.js

+ 1 - 0
.gitignore

@@ -4,3 +4,4 @@
 *.sublime-workspace
 tmp/
 node_modules/
+.vscode/

+ 3 - 0
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}}}.
 

+ 1 - 0
client/components/lists/listHeader.js

@@ -64,5 +64,6 @@ Template.listActionPopup.events({
     const currentList = this;
     evt.preventDefault();
     Lists.remove(currentList._id);
+    Popup.close();
   },
 });

+ 1 - 1
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",

+ 11 - 0
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({