Ver código fonte

Merge pull request #65 from BaobabCoder/devel

Remove a list
Lauri Ojansivu 8 anos atrás
pai
commit
8bd7d624da

+ 1 - 0
.gitignore

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

+ 3 - 0
client/components/activities/activities.jade

@@ -47,6 +47,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}}}.
 

+ 3 - 0
client/components/lists/listHeader.jade

@@ -33,6 +33,9 @@ template(name="listActionPopup")
   hr
   ul.pop-over-list
     li: a.js-close-list {{_ 'archive-list'}}
+  hr
+  ul.pop-over-list
+    li: a.js-remove-list {{_ 'remove-list'}}
 
 template(name="boardLists")
   ul.pop-over-list

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

@@ -60,4 +60,10 @@ Template.listActionPopup.events({
     this.archive();
     Popup.close();
   },
+  'click .js-remove-list'(evt) {
+    const currentList = this;
+    evt.preventDefault();
+    Lists.remove(currentList._id);
+    Popup.close();
+  },
 });

+ 1 - 0
i18n/ar.i18n.json

@@ -268,6 +268,7 @@
     "remove-cover": "حذف الغلاف",
     "remove-from-board": "حذف من اللوحة",
     "remove-label": "حذف هذه العلامة",
+    "remove-list": "Remove the list",
     "remove-member": "حذف العضو",
     "remove-member-from-card": "حذف من البطاقة",
     "remove-member-pop": "حذف __name__ (__username__) من __boardTitle__ ? سيتم حذف هذا العضو من جميع بطاقة اللوحة مع إرسال إشعار له بذاك.",

+ 1 - 0
i18n/ca.i18n.json

@@ -269,6 +269,7 @@
     "remove-from-board": "Elimina del tauler",
     "remove-label": "Eliminia etiqueta",
     "remove-member": "Elimina membre",
+    "remove-list": "Remove the list",
     "remove-member-from-card": "Elimina de la fitxa",
     "remove-member-pop": "Eliminar  __name__ (__username__) de __boardTitle__ ? El membre serà eliminat de totes les fitxes d'aquest tauler. Ells rebran una notificació.",
     "removeMemberPopup-title": "Vols suprimir el membre?",

+ 1 - 0
i18n/cs.i18n.json

@@ -268,6 +268,7 @@
     "remove-cover": "Odstranit obal",
     "remove-from-board": "Odstranit z tabla",
     "remove-label": "Odstranit štítek",
+    "remove-list": "Remove the list",
     "remove-member": "Odebrat uživatele",
     "remove-member-from-card": "Odstranit z karty",
     "remove-member-pop": "Odstranit __name__ (__username__) z __boardTitle__? Uživatel bude odebrán ze všech karet na tomto tablu. Na tuto skutečnost bude upozorněn.",

+ 1 - 0
i18n/de.i18n.json

@@ -268,6 +268,7 @@
     "remove-cover": "Cover entfernen",
     "remove-from-board": "Von Board entfernen",
     "remove-label": "Label entfernen",
+    "remove-list": "Remove the list",
     "remove-member": "Nutzer entfernen",
     "remove-member-from-card": "Von Karte entfernen",
     "remove-member-pop": "__name__ (__username__) von __boardTitle__ entfernen? Das Mitglied wird von allen Karten auf diesem Board entfernt. Er erhält eine Benachrichtigung.",

+ 1 - 0
i18n/en.i18n.json

@@ -272,6 +272,7 @@
     "remove-cover": "Remove Cover",
     "remove-from-board": "Remove from Board",
     "remove-label": "Remove the label",
+    "remove-list": "Remove the list",
     "remove-member": "Remove Member",
     "remove-member-from-card": "Remove from Card",
     "remove-member-pop": "Remove __name__ (__username__) from __boardTitle__? The member will be removed from all cards on this board. They will receive a notification.",

+ 1 - 0
i18n/es-ES.i18n.json

@@ -268,6 +268,7 @@
     "remove-cover": "Eliminar cubierta",
     "remove-from-board": "Eliminar del tablero",
     "remove-label": "Eliminar etiqueta",
+    "remove-list": "Remove the list",
     "remove-member": "Eliminar Miembro",
     "remove-member-from-card": "Eliminar de la Tarjeta",
     "remove-member-pop": "Eliminar  __name__ (__username__) de __boardTitle__? El miembro será eliminado de todas las tarjetas de este tablero. Ellos recibirán una notificación.",

+ 1 - 0
i18n/es.i18n.json

@@ -268,6 +268,7 @@
     "remove-cover": "Eliminar cubierta",
     "remove-from-board": "Remove from Board",
     "remove-label": "Remove the label",
+    "remove-list": "Remove the list",
     "remove-member": "Eliminar Miembro",
     "remove-member-from-card": "Eliminar de la Ficha",
     "remove-member-pop": "Eliminar __nombre__ (__usuario__) de __Título del tablero__? El miembro será eliminado de todas las tarjetas de este tablero. Ellos recibirán una notificación.",

+ 1 - 0
i18n/fi.i18n.json

@@ -268,6 +268,7 @@
     "remove-cover": "Poista kansi",
     "remove-from-board": "Poista taululta",
     "remove-label": "Poista tunniste",
+    "remove-list": "Remove the list",
     "remove-member": "Poista jäsen",
     "remove-member-from-card": "Poista kortilta",
     "remove-member-pop": "Poista __name__ (__username__) taululta __boardTitle__? Jäsen poistetaan kaikilta taulun korteilta. Heille lähetetään ilmoitus.",

+ 2 - 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",
@@ -268,6 +268,7 @@
     "remove-cover": "Enlever la couverture",
     "remove-from-board": "Retirer du tableau",
     "remove-label": "Retirer cette étiquette",
+    "remove-list": "Supprimer la liste",
     "remove-member": "Supprimer le membre",
     "remove-member-from-card": "Supprimer de la carte",
     "remove-member-pop": "Supprimer __name__ (__username__) de __boardTitle__ ? Ce membre sera supprimé de toutes les cartes du tableau et recevra une notification.",

+ 1 - 0
i18n/he.i18n.json

@@ -268,6 +268,7 @@
     "remove-cover": "הסר כיסוי",
     "remove-from-board": "הסר מהלוח",
     "remove-label": "הסר תווית",
+    "remove-list": "Remove the list",
     "remove-member": "הסר חבר",
     "remove-member-from-card": "הסר מהכרטיס",
     "remove-member-pop": "הסר __name__ (__username__) מ __boardTitle__? החבר יוסר מכל הכרטיסים בלוח זה. הוא יקבל על כך הודעה.",

+ 1 - 0
i18n/it.i18n.json

@@ -268,6 +268,7 @@
     "remove-cover": "Rimuovi cover",
     "remove-from-board": "Rimuovi dalla bacheca",
     "remove-label": "Rimuovi l'etichetta",
+    "remove-list": "Remove the list",
     "remove-member": "Rimuovi utente",
     "remove-member-from-card": "Rimuovi dalla scheda",
     "remove-member-pop": "Rimuovere __name__ (__username__) da __boardTitle__? L'utente sarà rimosso da tutte le schede in questa bacheca. Riceveranno una notifica.",

+ 1 - 0
i18n/ja.i18n.json

@@ -268,6 +268,7 @@
     "remove-cover": "カバーの削除",
     "remove-from-board": "Remove from Board",
     "remove-label": "Remove the label",
+    "remove-list": "Remove the list",
     "remove-member": "メンバーを外す",
     "remove-member-from-card": "カードから取り除く",
     "remove-member-pop": "__boardTitle__ から __name__ (__username__) を外しますか?メンバーはこのボードのすべてのカードから外れ、通知を受けます。",

+ 1 - 0
i18n/ko.i18n.json

@@ -268,6 +268,7 @@
     "remove-cover": "커버 제거",
     "remove-from-board": "Remove from Board",
     "remove-label": "Remove the label",
+    "remove-list": "Remove the list",
     "remove-member": "멤버 제거",
     "remove-member-from-card": "카드에서 제거",
     "remove-member-pop": "__boardTitle__에서 __name__(__username__) 을 제거합니까? 그 멤버는 이 보드의 모든 카드에서 제거됩니다. 그에대한 알람을 받게됩니다.",

+ 1 - 0
i18n/pl.i18n.json

@@ -268,6 +268,7 @@
     "remove-cover": "Usuń okładkę",
     "remove-from-board": "Usuń z tablicy",
     "remove-label": "Usuń etykietę",
+    "remove-list": "Remove the list",
     "remove-member": "Usuń członka",
     "remove-member-from-card": "Usuń z karty",
     "remove-member-pop": "Remove __name__ (__username__) from __boardTitle__? The member will be removed from all cards on this board. They will receive a notification.",

+ 1 - 0
i18n/pt-BR.i18n.json

@@ -268,6 +268,7 @@
     "remove-cover": "Remover Capa",
     "remove-from-board": "Remover do Quadro",
     "remove-label": "Remover Etiqueta",
+    "remove-list": "Remove the list",
     "remove-member": "Remover Membro",
     "remove-member-from-card": "Remover do Cartão",
     "remove-member-pop": "Remover __name__ (__username__) de __boardTitle__? O membro será removido de todos os cartões neste quadro e será notificado.",

+ 1 - 0
i18n/ru.i18n.json

@@ -268,6 +268,7 @@
     "remove-cover": "Открепить",
     "remove-from-board": "Удалить с доски",
     "remove-label": "Удалить метку",
+    "remove-list": "Remove the list",
     "remove-member": "Удалить участника",
     "remove-member-from-card": "Удалить из карточки",
     "remove-member-pop": "Удалить участника __name__ (__username__) из доски __boardTitle__? Участник будет удален из всех карточек. Также он получит уведомление о совершаемом действии.",

+ 1 - 0
i18n/tr.i18n.json

@@ -268,6 +268,7 @@
     "remove-cover": "Remove Cover",
     "remove-from-board": "Remove from Board",
     "remove-label": "Remove the label",
+    "remove-list": "Remove the list",
     "remove-member": "Üyeyi Çıkar",
     "remove-member-from-card": "Karttan Çıkar",
     "remove-member-pop": "__boardTitle__ panosundan __name__ (__username__) çıkarılsın mı? Üye, bu panodaki tüm kartlardan çıkarılacak ve bir bildirim alacak.",

+ 1 - 0
i18n/zh-CN.i18n.json

@@ -268,6 +268,7 @@
     "remove-cover": "移除封面",
     "remove-from-board": "从看板中删除",
     "remove-label": "移除标签",
+    "remove-list": "Remove the list",
     "remove-member": "移除成员",
     "remove-member-from-card": "从该卡片中移除",
     "remove-member-pop": "确定从 __boardTitle__ 中移除 __name__ (__username__) 吗? 该成员将被从该看板的所有卡片中移除,同时他会收到一条提醒。",

+ 1 - 0
i18n/zh-TW.i18n.json

@@ -268,6 +268,7 @@
     "remove-cover": "移除封面",
     "remove-from-board": "從看板中刪除",
     "remove-label": "移除標籤",
+    "remove-list": "Remove the list",
     "remove-member": "移除成員",
     "remove-member-from-card": "從該卡片中移除",
     "remove-member-pop": "確定從 __boardTitle__ 中移除 __name__ (__username__) 嗎? 該成員將被從該看板的所有卡片中移除,同時他會收到一則提醒。",

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