From a666883986073f9b2f00fce0b9be30d709628b22 Mon Sep 17 00:00:00 2001 From: "Sam X. Chen" Date: Tue, 13 Aug 2019 09:28:42 -0400 Subject: Addfeature: showing action in system message when user deleted/edited comments, plus changing email content \n to
--- client/components/activities/activities.jade | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'client/components') diff --git a/client/components/activities/activities.jade b/client/components/activities/activities.jade index 5be953b6..deb73072 100644 --- a/client/components/activities/activities.jade +++ b/client/components/activities/activities.jade @@ -201,6 +201,7 @@ template(name="cardActivities") .activity-checklist(href="{{ card.absoluteUrl }}") +viewer = checklistItem.title + if(currentData.timeKey) | {{{_ activityType }}} = ' ' @@ -215,6 +216,10 @@ template(name="cardActivities") | {{{_ activityType currentData.timeValue}}} + if($eq activityType 'deleteComment') + | {{{_ 'activity-deleteComment' currentData.commentId}}}. + if($eq activityType 'editComment') + | {{{_ 'activity-editComment' currentData.commentId}}}. if($eq activityType 'addComment') +inlinedForm(classNames='js-edit-comment') +editor(autofocus=true) -- cgit v1.2.3-1-g7c22 From 843478ac40b7718f1096a75295522487f0ca6dbe Mon Sep 17 00:00:00 2001 From: jymcheong Date: Wed, 14 Aug 2019 15:44:47 +0800 Subject: Webhook cardDetails onRendered Send webhook when cardDetails is rendered. --- client/components/cards/cardDetails.js | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'client/components') diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js index 781967ae..f52661b7 100644 --- a/client/components/cards/cardDetails.js +++ b/client/components/cards/cardDetails.js @@ -117,6 +117,35 @@ BlazeComponent.extendComponent({ }, onRendered() { + // Send Webhook but not create Activities records --- + const card = this.currentData(); + const userId = Meteor.userId(); + //console.log(`userId: ${userId}`); + //console.log(`cardId: ${card._id}`); + //console.log(`boardId: ${card.boardId}`); + //console.log(`listId: ${card.listId}`); + //console.log(`swimlaneId: ${card.swimlaneId}`); + const params = { + userId, + cardId: card._id, + boardId: card.boardId, + listId: card.listId, + user: Meteor.user().username, + url: '', + }; + //console.log('looking for integrations...'); + const integrations = Integrations.find({ + boardId: card.boardId, + type: 'outgoing-webhooks', + enabled: true, + activities: { $in: ['CardDetailsRendered', 'all'] }, + }).fetch(); + //console.log(`Investigation length: ${integrations.length}`); + if (integrations.length > 0) { + Meteor.call('outgoingWebhooks', integrations, 'CardSelected', params); + } + //------------- + if (!Utils.isMiniScreen()) { Meteor.setTimeout(() => { $('.card-details').mCustomScrollbar({ -- cgit v1.2.3-1-g7c22 From b8c527d52bec7272c890385f11e26acec65822ae Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 15 Aug 2019 00:29:00 +0300 Subject: Add setting CARD_OPENED_WEBHOOK_ENABLED=false as default. Thanks to xet7 ! Related https://github.com/wekan/wekan/commit/843478ac40b7718f1096a75295522487f0ca6dbe , related #2518 --- client/components/cards/cardDetails.js | 56 ++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 27 deletions(-) (limited to 'client/components') diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js index f52661b7..cd8813f5 100644 --- a/client/components/cards/cardDetails.js +++ b/client/components/cards/cardDetails.js @@ -117,34 +117,36 @@ BlazeComponent.extendComponent({ }, onRendered() { - // Send Webhook but not create Activities records --- - const card = this.currentData(); - const userId = Meteor.userId(); - //console.log(`userId: ${userId}`); - //console.log(`cardId: ${card._id}`); - //console.log(`boardId: ${card.boardId}`); - //console.log(`listId: ${card.listId}`); - //console.log(`swimlaneId: ${card.swimlaneId}`); - const params = { - userId, - cardId: card._id, - boardId: card.boardId, - listId: card.listId, - user: Meteor.user().username, - url: '', - }; - //console.log('looking for integrations...'); - const integrations = Integrations.find({ - boardId: card.boardId, - type: 'outgoing-webhooks', - enabled: true, - activities: { $in: ['CardDetailsRendered', 'all'] }, - }).fetch(); - //console.log(`Investigation length: ${integrations.length}`); - if (integrations.length > 0) { - Meteor.call('outgoingWebhooks', integrations, 'CardSelected', params); + if (Meteor.settings.public.CARD_OPENED_WEBHOOK_ENABLED) { + // Send Webhook but not create Activities records --- + const card = this.currentData(); + const userId = Meteor.userId(); + //console.log(`userId: ${userId}`); + //console.log(`cardId: ${card._id}`); + //console.log(`boardId: ${card.boardId}`); + //console.log(`listId: ${card.listId}`); + //console.log(`swimlaneId: ${card.swimlaneId}`); + const params = { + userId, + cardId: card._id, + boardId: card.boardId, + listId: card.listId, + user: Meteor.user().username, + url: '', + }; + //console.log('looking for integrations...'); + const integrations = Integrations.find({ + boardId: card.boardId, + type: 'outgoing-webhooks', + enabled: true, + activities: { $in: ['CardDetailsRendered', 'all'] }, + }).fetch(); + //console.log(`Investigation length: ${integrations.length}`); + if (integrations.length > 0) { + Meteor.call('outgoingWebhooks', integrations, 'CardSelected', params); + } + //------------- } - //------------- if (!Utils.isMiniScreen()) { Meteor.setTimeout(() => { -- cgit v1.2.3-1-g7c22 From d302d6f857657ada229f78d9fcd32f63753d9779 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 15 Aug 2019 13:08:03 +0300 Subject: Fix bug: When on board, clicking Admin Panel redirects to All Boards page, so it did require to click Admin Panel again. Thanks to xet7 ! --- client/components/boards/boardBody.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'client/components') diff --git a/client/components/boards/boardBody.jade b/client/components/boards/boardBody.jade index fd094a93..76a85d87 100644 --- a/client/components/boards/boardBody.jade +++ b/client/components/boards/boardBody.jade @@ -7,8 +7,8 @@ template(name="board") +boardBody else //-- XXX We need a better error message in case the board has been archived - //-- +message(label="board-not-found") - | {{goHome}} + +message(label="board-not-found") + //-- | {{goHome}} else +spinner -- cgit v1.2.3-1-g7c22 From 7d52ae16d526602e8a01c6bf8157396cb1c7afe8 Mon Sep 17 00:00:00 2001 From: "Sam X. Chen" Date: Thu, 15 Aug 2019 14:23:14 -0400 Subject: Bugfix: 2621 Summmernote is too wide on mobile screen --- client/components/main/editor.js | 2 +- client/components/main/layouts.styl | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'client/components') diff --git a/client/components/main/editor.js b/client/components/main/editor.js index 82bda0a3..91403086 100755 --- a/client/components/main/editor.js +++ b/client/components/main/editor.js @@ -180,7 +180,7 @@ Template.editor.onRendered(() => { fBtn.on('click', function() { const $this = $(this), isActive = $this.hasClass('active'); - $('.minicards').toggle(!isActive); // mini card is still showing when editor is in fullscreen mode, we hide here manually + $('.minicards,#header-quick-access').toggle(!isActive); // mini card is still showing when editor is in fullscreen mode, we hide here manually }); } }, diff --git a/client/components/main/layouts.styl b/client/components/main/layouts.styl index 06538554..0955a352 100644 --- a/client/components/main/layouts.styl +++ b/client/components/main/layouts.styl @@ -425,6 +425,9 @@ a height: 100% margin: 0px + .panel-default + width: 83vw + .inline-input height: 37px margin: 8px 10px 0 0 -- cgit v1.2.3-1-g7c22