From b4353ce10226aa050aa84c3ab0102b9a5422e4e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakob=20R=C3=B6hrl?= Date: Wed, 30 Jan 2019 10:48:36 +0100 Subject: [PATCH 1/2] change UI after label has been changed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jakob Röhrl --- js/controller/BoardController.js | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/js/controller/BoardController.js b/js/controller/BoardController.js index 232bc4ec4..359cb8eef 100644 --- a/js/controller/BoardController.js +++ b/js/controller/BoardController.js @@ -323,7 +323,18 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St // remove from board data var i = BoardService.getCurrent().labels.indexOf(label); BoardService.getCurrent().labels.splice(i, 1); - // TODO: remove from cards + + // remove from cards + var cards = CardService.data; + for (var card in cards) { + var labelsFromCard = cards[card].labels; + + labelsFromCard.forEach(function (labelFromCard, index) { + if (labelFromCard.id === label.id) { + cards[card].labels.splice(index, 1); + } + }); + } }; $scope.labelCreate = function (label) { @@ -338,6 +349,18 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St $scope.labelUpdate = function (label) { label.edit = false; LabelService.update(label); + + // update labels in UI + var cards = CardService.data; + for (var card in cards) { + var labelsFromCard = cards[card].labels; + + labelsFromCard.forEach(function (labelFromCard, index) { + if (labelFromCard.id === label.id) { + cards[card].labels[index] = label; + } + }); + } }; $scope.aclAdd = function (sharee) { From 9d0a7b3f577fd4e25b2661c793cd136393f71b93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Thu, 14 Feb 2019 15:10:07 +0100 Subject: [PATCH 2/2] Fix eslint error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- js/controller/BoardController.js | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/js/controller/BoardController.js b/js/controller/BoardController.js index 359cb8eef..e6599f2f8 100644 --- a/js/controller/BoardController.js +++ b/js/controller/BoardController.js @@ -327,13 +327,15 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St // remove from cards var cards = CardService.data; for (var card in cards) { - var labelsFromCard = cards[card].labels; + if (Object.prototype.hasOwnProperty.call(cards, card)) { + var labelsFromCard = cards[card].labels; - labelsFromCard.forEach(function (labelFromCard, index) { - if (labelFromCard.id === label.id) { - cards[card].labels.splice(index, 1); - } - }); + labelsFromCard.forEach(function (labelFromCard, index) { + if (labelFromCard.id === label.id) { + cards[card].labels.splice(index, 1); + } + }); + } } }; @@ -353,13 +355,15 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St // update labels in UI var cards = CardService.data; for (var card in cards) { - var labelsFromCard = cards[card].labels; + if (Object.prototype.hasOwnProperty.call(cards, card)) { + var labelsFromCard = cards[card].labels; - labelsFromCard.forEach(function (labelFromCard, index) { - if (labelFromCard.id === label.id) { - cards[card].labels[index] = label; - } - }); + labelsFromCard.forEach(function (labelFromCard, index) { + if (labelFromCard.id === label.id) { + cards[card].labels[index] = label; + } + }); + } } };