From 82158f03a06f1eb3eae8fbc9ab78e191d48fd1e5 Mon Sep 17 00:00:00 2001 From: Julius Haertl Date: Fri, 8 Jul 2016 19:29:07 +0200 Subject: [PATCH] add acl stuff --- appinfo/database.xml | 16 ++++++++++++++++ appinfo/info.xml | 2 +- js/controller/BoardController.js | 4 ++++ js/public/app.js | 4 ++++ templates/part.board.sidebarView.php | 2 +- 5 files changed, 26 insertions(+), 2 deletions(-) diff --git a/appinfo/database.xml b/appinfo/database.xml index 3404b0772..056055a19 100644 --- a/appinfo/database.xml +++ b/appinfo/database.xml @@ -372,6 +372,22 @@ boolean false + + true + + board_id + ascending + + + type + ascending + + + participant + ascending + + + diff --git a/appinfo/info.xml b/appinfo/info.xml index 30b2ef54a..b31ac149f 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -5,7 +5,7 @@ My first ownCloud app AGPL Julius Härtl - 0.0.1.11 + 0.0.1.13 Deck other diff --git a/js/controller/BoardController.js b/js/controller/BoardController.js index a6bf06ced..444d6ff55 100644 --- a/js/controller/BoardController.js +++ b/js/controller/BoardController.js @@ -91,6 +91,10 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St BoardService.addSharee(sharee); $scope.status.addSharee = null; } + $scope.deleteAcl = function(acl) { + acl.boardId = $scope.id; + BoardService.removeAcl(acl); + } // TODO: move to filter? // Lighten Color of the board for background usage $scope.rgblight = function (hex) { diff --git a/js/public/app.js b/js/public/app.js index 3b031e4ca..2f4bab2ef 100644 --- a/js/public/app.js +++ b/js/public/app.js @@ -199,6 +199,10 @@ app.controller('BoardController', ["$rootScope", "$scope", "$stateParams", "Stat BoardService.addSharee(sharee); $scope.status.addSharee = null; } + $scope.deleteAcl = function(acl) { + acl.boardId = $scope.id; + BoardService.removeAcl(acl); + } // TODO: move to filter? // Lighten Color of the board for background usage $scope.rgblight = function (hex) { diff --git a/templates/part.board.sidebarView.php b/templates/part.board.sidebarView.php index 4cdf33115..f99ab330b 100644 --- a/templates/part.board.sidebarView.php +++ b/templates/part.board.sidebarView.php @@ -50,7 +50,7 @@ - +