From 64e36d48278f355da4e2c3f6e182ae22b33ddd5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A9ranger=20Campardou?= Date: Thu, 12 Jan 2017 16:14:51 +0100 Subject: [PATCH 1/5] Remove a list --- client/components/lists/listHeader.jade | 3 +++ client/components/lists/listHeader.js | 5 +++++ i18n/ar.i18n.json | 1 + i18n/ca.i18n.json | 1 + i18n/cs.i18n.json | 3 ++- i18n/de.i18n.json | 1 + i18n/en.i18n.json | 1 + i18n/es-ES.i18n.json | 3 ++- i18n/es.i18n.json | 1 + i18n/fi.i18n.json | 1 + i18n/fr.i18n.json | 3 ++- i18n/he.i18n.json | 3 ++- i18n/it.i18n.json | 1 + i18n/ja.i18n.json | 1 + i18n/ko.i18n.json | 1 + i18n/pl.i18n.json | 3 ++- i18n/pt-BR.i18n.json | 3 ++- i18n/ru.i18n.json | 1 + i18n/tr.i18n.json | 1 + i18n/zh-CN.i18n.json | 3 ++- i18n/zh-TW.i18n.json | 3 ++- 21 files changed, 35 insertions(+), 8 deletions(-) diff --git a/client/components/lists/listHeader.jade b/client/components/lists/listHeader.jade index f9fe065ff..aff059e8f 100644 --- a/client/components/lists/listHeader.jade +++ b/client/components/lists/listHeader.jade @@ -29,6 +29,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 diff --git a/client/components/lists/listHeader.js b/client/components/lists/listHeader.js index c7ae8e629..641cdd3ac 100644 --- a/client/components/lists/listHeader.js +++ b/client/components/lists/listHeader.js @@ -52,4 +52,9 @@ Template.listActionPopup.events({ this.archive(); Popup.close(); }, + 'click .js-remove-list'(evt) { + const currentList = this; + evt.preventDefault(); + Lists.remove(currentList._id); + } }); diff --git a/i18n/ar.i18n.json b/i18n/ar.i18n.json index 225b09752..8528068f1 100755 --- a/i18n/ar.i18n.json +++ b/i18n/ar.i18n.json @@ -223,6 +223,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__ ? سيتم حذف هذا العضو من جميع بطاقة اللوحة مع إرسال إشعار له بذاك.", diff --git a/i18n/ca.i18n.json b/i18n/ca.i18n.json index fa223d022..ba6e1b133 100755 --- a/i18n/ca.i18n.json +++ b/i18n/ca.i18n.json @@ -224,6 +224,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?", diff --git a/i18n/cs.i18n.json b/i18n/cs.i18n.json index 30c847488..3326307a7 100644 --- a/i18n/cs.i18n.json +++ b/i18n/cs.i18n.json @@ -223,6 +223,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.", @@ -260,4 +261,4 @@ "view-it": "Zobrazit", "warn-list-archived": "varování: tato karta je v archivovaném seznamu", "what-to-do": "Co chcete dělat?" -} \ No newline at end of file +} diff --git a/i18n/de.i18n.json b/i18n/de.i18n.json index 43e12d885..e7bc63d35 100755 --- a/i18n/de.i18n.json +++ b/i18n/de.i18n.json @@ -223,6 +223,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": "Entferne __name__ (__username__) von __boardTitle__? Nutzer wird von allen Karten auf diesem Board entfernt werden. Er wird eine Benachrichtigung erhalten.", diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index f9cf7e82e..98d33100a 100755 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -253,6 +253,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.", diff --git a/i18n/es-ES.i18n.json b/i18n/es-ES.i18n.json index 22aeb7041..8f67fcfde 100644 --- a/i18n/es-ES.i18n.json +++ b/i18n/es-ES.i18n.json @@ -223,6 +223,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.", @@ -260,4 +261,4 @@ "view-it": "Visto", "warn-list-archived": "Aviso: esta tarjeta está en una lista archivada", "what-to-do": "¿Qué quieres hacer?" -} \ No newline at end of file +} diff --git a/i18n/es.i18n.json b/i18n/es.i18n.json index b4af8f5ac..760b1aa52 100755 --- a/i18n/es.i18n.json +++ b/i18n/es.i18n.json @@ -223,6 +223,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.", diff --git a/i18n/fi.i18n.json b/i18n/fi.i18n.json index caab4faff..f3ab29a4b 100755 --- a/i18n/fi.i18n.json +++ b/i18n/fi.i18n.json @@ -223,6 +223,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.", diff --git a/i18n/fr.i18n.json b/i18n/fr.i18n.json index adc4baa4a..29164799e 100755 --- a/i18n/fr.i18n.json +++ b/i18n/fr.i18n.json @@ -223,6 +223,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.", @@ -260,4 +261,4 @@ "view-it": "Le voir", "warn-list-archived": "Attention : cette carte est dans une liste archivée", "what-to-do": "Que voulez-vous faire ?" -} \ No newline at end of file +} diff --git a/i18n/he.i18n.json b/i18n/he.i18n.json index f08f430bf..fedb9e8c7 100644 --- a/i18n/he.i18n.json +++ b/i18n/he.i18n.json @@ -223,6 +223,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__? החבר יוסר מכל הכרטיסים בלוח זה. הוא יקבל על כך הודעה.", @@ -260,4 +261,4 @@ "view-it": "צפה", "warn-list-archived": "אזהרה: הכרטיס נמצא ברשימה שהועברה לארכיון", "what-to-do": "מה תרצה לעשות?" -} \ No newline at end of file +} diff --git a/i18n/it.i18n.json b/i18n/it.i18n.json index 07026fd4e..847e3c2f2 100755 --- a/i18n/it.i18n.json +++ b/i18n/it.i18n.json @@ -223,6 +223,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.", diff --git a/i18n/ja.i18n.json b/i18n/ja.i18n.json index 6cde68c60..aa04ceb73 100755 --- a/i18n/ja.i18n.json +++ b/i18n/ja.i18n.json @@ -223,6 +223,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__) を外しますか？メンバーはこのボードのすべてのカードから外れ、通知を受けます。", diff --git a/i18n/ko.i18n.json b/i18n/ko.i18n.json index 823a221d1..843d51e46 100755 --- a/i18n/ko.i18n.json +++ b/i18n/ko.i18n.json @@ -223,6 +223,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__) 을 제거합니까? 그 멤버는 이 보드의 모든 카드에서 제거됩니다. 그에대한 알람을 받게됩니다.", diff --git a/i18n/pl.i18n.json b/i18n/pl.i18n.json index d44bccdbd..6ca78ce24 100644 --- a/i18n/pl.i18n.json +++ b/i18n/pl.i18n.json @@ -223,6 +223,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.", @@ -260,4 +261,4 @@ "view-it": "Zobacz", "warn-list-archived": "ostrzeżenie: ta karta jest na zarchiwizowanej liście", "what-to-do": "Co chcesz zrobić?" -} \ No newline at end of file +} diff --git a/i18n/pt-BR.i18n.json b/i18n/pt-BR.i18n.json index 189d42987..5f5d45c5f 100755 --- a/i18n/pt-BR.i18n.json +++ b/i18n/pt-BR.i18n.json @@ -223,6 +223,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.", @@ -260,4 +261,4 @@ "view-it": "Visualizar", "warn-list-archived": "aviso: este cartão está em uma lista arquivada", "what-to-do": "O que você gostaria de fazer?" -} \ No newline at end of file +} diff --git a/i18n/ru.i18n.json b/i18n/ru.i18n.json index a2319a27d..880ccc482 100755 --- a/i18n/ru.i18n.json +++ b/i18n/ru.i18n.json @@ -220,6 +220,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__? Участник будет удален из всех карточек. Также он получит уведомление о совершаемом действии.", diff --git a/i18n/tr.i18n.json b/i18n/tr.i18n.json index c05833bbe..7df531e7f 100755 --- a/i18n/tr.i18n.json +++ b/i18n/tr.i18n.json @@ -223,6 +223,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.", diff --git a/i18n/zh-CN.i18n.json b/i18n/zh-CN.i18n.json index 4cfd03f0b..2e11edc82 100755 --- a/i18n/zh-CN.i18n.json +++ b/i18n/zh-CN.i18n.json @@ -223,6 +223,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__) 吗? 该成员将被从该看板的所有卡片中移除，同时他会收到一条提醒。", @@ -260,4 +261,4 @@ "view-it": "查看", "warn-list-archived": "警告: 该卡片位于已归档清单中", "what-to-do": "要做什么？" -} \ No newline at end of file +} diff --git a/i18n/zh-TW.i18n.json b/i18n/zh-TW.i18n.json index 9479acd33..5ee29ce53 100644 --- a/i18n/zh-TW.i18n.json +++ b/i18n/zh-TW.i18n.json @@ -223,6 +223,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__) 嗎? 該成員將被從該看板的所有卡片中移除，同時他會收到一則提醒。", @@ -260,4 +261,4 @@ "view-it": "檢視", "warn-list-archived": "警告: 該卡片位於已刪除的清單中", "what-to-do": "要做什麼？" -} \ No newline at end of file +} From 5eda2c80f8de3f0b025f5233613cdbb409a73e94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A9ranger=20Campardou?= Date: Fri, 13 Jan 2017 11:05:31 +0100 Subject: [PATCH 2/5] missing coma --- client/components/lists/listHeader.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/components/lists/listHeader.js b/client/components/lists/listHeader.js index 641cdd3ac..6910c58aa 100644 --- a/client/components/lists/listHeader.js +++ b/client/components/lists/listHeader.js @@ -56,5 +56,5 @@ Template.listActionPopup.events({ const currentList = this; evt.preventDefault(); Lists.remove(currentList._id); - } + }, }); From 1169c0d7dc8184ed4db615673844024bbbfd4e66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A9ranger=20Campardou?= Date: Fri, 13 Jan 2017 11:16:54 +0100 Subject: [PATCH 3/5] resolve conflicts --- i18n/it.i18n.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/i18n/it.i18n.json b/i18n/it.i18n.json index 00a7a28cf..45036fce3 100755 --- a/i18n/it.i18n.json +++ b/i18n/it.i18n.json @@ -268,7 +268,7 @@ "remove-cover": "Rimuovi cover", "remove-from-board": "Rimuovi dalla bacheca", "remove-label": "Rimuovi l'etichetta", - "remove-list": "Remove list", + "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.", From 23cb98bb825a2e210a8d314ecaba228ed7d332f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A9ranger=20Campardou?= Date: Fri, 20 Jan 2017 11:09:34 +0100 Subject: [PATCH 4/5] Fix activity message for list deletion --- .gitignore | 1 + client/components/activities/activities.jade | 3 +++ client/components/lists/listHeader.js | 1 + i18n/fr.i18n.json | 2 +- models/lists.js | 11 +++++++++++ 5 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 564db75d1..dd2671fba 100644 --- a/.gitignore +++ b/.gitignore @@ -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 9ff738647..b47dac22f 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 65a464bbf..f352022dd 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 8c2281058..4304f15f4 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 9ae2e4f7c..3c50fba0b 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({ From 5b58b0b40c876ed58fb40f51436d05505d8b1548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A9ranger=20Campardou?= Date: Fri, 20 Jan 2017 11:11:57 +0100 Subject: [PATCH 5/5] missing coma --- models/lists.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/lists.js b/models/lists.js index 3c50fba0b..682fb0960 100644 --- a/models/lists.js +++ b/models/lists.js @@ -112,7 +112,7 @@ if (Meteor.isServer) { activityType: 'removeList', boardId: doc.boardId, listId: doc._id, - title: doc.title + title: doc.title, }); });