From 8cec7cb5718609046759e512871a1b129b299fd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Fri, 22 Dec 2017 12:16:08 +0100 Subject: [PATCH 1/5] Check if board is undefined (fixes #366) 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 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/js/controller/BoardController.js b/js/controller/BoardController.js index b13ee3b80..062c05ca1 100644 --- a/js/controller/BoardController.js +++ b/js/controller/BoardController.js @@ -55,7 +55,11 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St }; $scope.$watch(function () { - return BoardService.getCurrent().title; + if (typeof BoardService.getCurrent() !== 'undefined') { + return BoardService.getCurrent().title; + } else { + return null; + } }, function () { $scope.setPageTitle(); }); From 70d28ec3768f3d3de9a1daf2a5c875d4490f8388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Fri, 22 Dec 2017 12:16:29 +0100 Subject: [PATCH 2/5] Remove duplicate and unused id MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- templates/part.boardlist.php | 4 ++-- templates/part.navigation.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/part.boardlist.php b/templates/part.boardlist.php index 3047d0c36..0c7d3fff2 100644 --- a/templates/part.boardlist.php +++ b/templates/part.boardlist.php @@ -32,7 +32,7 @@
{{ b.title }}
- +

@@ -99,7 +99,7 @@ -
diff --git a/templates/part.navigation.php b/templates/part.navigation.php index 9e207d0c7..60611add2 100644 --- a/templates/part.navigation.php +++ b/templates/part.navigation.php @@ -35,7 +35,7 @@
- +
@@ -50,7 +50,7 @@
- +
From 5d38f6a176b5130021098f7a45cd555f340f2f6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Fri, 22 Dec 2017 12:20:21 +0100 Subject: [PATCH 3/5] Fix board bullet opacity (fixes #364) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- css/style.scss | 4 ++++ templates/part.board.mainView.php | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/css/style.scss b/css/style.scss index e228b4136..93a97ca81 100644 --- a/css/style.scss +++ b/css/style.scss @@ -190,6 +190,10 @@ input.input-inline { .crumb { order: 0; + .bullet { + opacity: 1; + } + a:nth-child(2), a:nth-child(3) { padding-left: 0; diff --git a/templates/part.board.mainView.php b/templates/part.board.mainView.php index 823527d11..f1184f43a 100644 --- a/templates/part.board.mainView.php +++ b/templates/part.board.mainView.php @@ -14,7 +14,7 @@ t('Archived boards')); ?>
- + {{ boardservice.getCurrent().title }}
From dc37dd2c609d901a545d561b9de40c3510a48e5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Fri, 22 Dec 2017 12:37:57 +0100 Subject: [PATCH 4/5] Use separate object when editing card descriptions (fixes #369) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- js/controller/CardController.js | 5 +++-- templates/part.card.php | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/js/controller/CardController.js b/js/controller/CardController.js index f4815f517..4556b5b08 100644 --- a/js/controller/CardController.js +++ b/js/controller/CardController.js @@ -58,6 +58,7 @@ app.controller('CardController', function ($scope, $rootScope, $routeParams, $lo return false; } $scope.status.cardEditDescription = true; + $scope.status.edit = angular.copy(CardService.getCurrent()); return true; }; $scope.cardEditDescriptionChanged = function ($event) { @@ -73,7 +74,7 @@ app.controller('CardController', function ($scope, $rootScope, $routeParams, $lo $scope.status.lastSave = currentTime; var header = $('.section-header.card-description'); header.find('.save-indicator.unsaved').fadeIn(500); - CardService.update(CardService.getCurrent()).then(function (data) { + CardService.update($scope.status.edit).then(function (data) { var header = $('.section-header.card-description'); header.find('.save-indicator.unsaved').hide(); header.find('.save-indicator.saved').fadeIn(250).fadeOut(1000); @@ -89,7 +90,7 @@ app.controller('CardController', function ($scope, $rootScope, $routeParams, $lo }); }; $scope.cardUpdate = function (card) { - CardService.update(CardService.getCurrent()).then(function (data) { + CardService.update(card).then(function (data) { $scope.status.cardEditDescription = false; var header = $('.section-content.card-description'); header.find('.save-indicator.unsaved').hide(); diff --git a/templates/part.card.php b/templates/part.card.php index 9931c1248..eaf9258be 100644 --- a/templates/part.card.php +++ b/templates/part.card.php @@ -98,8 +98,8 @@
Date: Fri, 22 Dec 2017 12:40:27 +0100 Subject: [PATCH 5/5] Check for undefined type when getting the acl string representation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fixes #367 Signed-off-by: Julius Härtl --- js/controller/BoardController.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/js/controller/BoardController.js b/js/controller/BoardController.js index 062c05ca1..01990f108 100644 --- a/js/controller/BoardController.js +++ b/js/controller/BoardController.js @@ -215,6 +215,9 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St }; $scope.aclTypeString = function (acl) { + if (typeof acl === 'undefined') { + return ''; + } switch (acl.type) { case OC.Share.SHARE_TYPE_USER: return 'user';