Disable ui elements if permissions are not sufficient

appinfo/routes.php

@@ -34,6 +34,7 @@ return [
         ['name' => 'board#read', 'url' => '/boards/{boardId}', 'verb' => 'GET'],
         ['name' => 'board#update', 'url' => '/boards/{boardId}', 'verb' => 'PUT'],
         ['name' => 'board#delete', 'url' => '/boards/{boardId}', 'verb' => 'DELETE'],
+		['name' => 'board#getUserPermissions', 'url' => '/boards/{boardId}/permissions', 'verb' => 'GET'],
         ['name' => 'board#addAcl', 'url' => '/boards/{boardId}/acl', 'verb' => 'POST'],
         ['name' => 'board#updateAcl', 'url' => '/boards/{boardId}/acl', 'verb' => 'PUT'],
         ['name' => 'board#deleteAcl', 'url' => '/boards/{boardId}/acl/{aclId}', 'verb' => 'DELETE'],

js/controller/AppController.js

@@ -25,4 +25,5 @@ app.controller('AppController', function ($scope, $location, $http, $route, $log
         show: false
     };
     $scope.sidebar = $rootScope.sidebar;
+    $scope.user = oc_current_user;
 });

js/controller/BoardController.js

@@ -113,6 +113,7 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St
 
 	// Handle initial Loading
 	BoardService.fetchOne($scope.id).then(function (data) {
+		BoardService.getPermissions();
 		$scope.statusservice.releaseWaiting();
 	}, function (error) {
 		$scope.statusservice.setError('Error occured', error);

js/controller/CardController.js

@@ -41,14 +41,14 @@ app.controller('CardController', function ($scope, $rootScope, $routeParams, $lo
     });
 
     $scope.cardRenameShow = function() {
-        if($scope.archived)
+        if($scope.archived || !BoardService.canEdit())
             return false;
         else {
             $scope.status.cardRename=true;
         }
     };
     $scope.cardEditDescriptionShow = function() {
-        if($scope.archived)
+        if($scope.archived || !BoardService.canEdit())
             return false;
         else {
             $scope.status.cardEditDescription=true;

js/public/app.js

@@ -113,6 +113,7 @@ app.controller('AppController', ["$scope", "$location", "$http", "$route", "$log
         show: false
     };
     $scope.sidebar = $rootScope.sidebar;
+    $scope.user = oc_current_user;
 }]);
 app.controller('BoardController', ["$rootScope", "$scope", "$stateParams", "StatusService", "BoardService", "StackService", "CardService", "LabelService", "$state", "$transitions", "$filter", function ($rootScope, $scope, $stateParams, StatusService, BoardService, StackService, CardService, LabelService, $state, $transitions, $filter) {
 
@@ -207,6 +208,7 @@ app.controller('BoardController', ["$rootScope", "$scope", "$stateParams", "Stat
 
 	// Handle initial Loading
 	BoardService.fetchOne($scope.id).then(function (data) {
+		BoardService.getPermissions();
 		$scope.statusservice.releaseWaiting();
 	}, function (error) {
 		$scope.statusservice.setError('Error occured', error);
@@ -361,14 +363,14 @@ app.controller('CardController', ["$scope", "$rootScope", "$routeParams", "$loca
     });
 
     $scope.cardRenameShow = function() {
-        if($scope.archived)
+        if($scope.archived || !BoardService.canEdit())
             return false;
         else {
             $scope.status.cardRename=true;
         }
     };
     $scope.cardEditDescriptionShow = function() {
-        if($scope.archived)
+        if($scope.archived || !BoardService.canEdit())
             return false;
         else {
             $scope.status.cardEditDescription=true;
@@ -978,6 +980,46 @@ app.factory('BoardService', ["ApiService", "$http", "$q", function(ApiService, $
         return deferred.promise;
     };
 
+    BoardService.prototype.getPermissions = function() {
+        var board = this.getCurrent();
+        var deferred = $q.defer();
+        $http.get(this.baseUrl + '/' + board.id + '/permissions').then(function (response) {
+            board.permissions = response.data;
+            console.log(board.permissions);
+            deferred.resolve(response.data);
+        }, function (error) {
+            deferred.reject('Error fetching board permissions ' + board);
+        });
+    };
+
+    BoardService.prototype.canRead = function() {
+        if(!this.getCurrent() || !this.getCurrent().permissions) {
+            return false;
+        }
+        return this.getCurrent().permissions['PERMISSION_READ'];
+    }
+
+    BoardService.prototype.canEdit = function() {
+        if(!this.getCurrent() || !this.getCurrent().permissions) {
+            return false;
+        }
+        return this.getCurrent().permissions['PERMISSION_EDIT'];
+    }
+
+    BoardService.prototype.canManage = function() {
+        if(!this.getCurrent() || !this.getCurrent().permissions) {
+            return false;
+        }
+        return this.getCurrent().permissions['PERMISSION_MANAGE'];
+    }
+
+    BoardService.prototype.canShare = function() {
+        if(!this.getCurrent() || !this.getCurrent().permissions) {
+            return false;
+        }
+        return this.getCurrent().permissions['PERMISSION_SHARE'];
+    }
+
     service = new BoardService($http, 'boards', $q);
     return service;
     

js/service/BoardService.js

@@ -100,6 +100,46 @@ app.factory('BoardService', function(ApiService, $http, $q){
         return deferred.promise;
     };
 
+    BoardService.prototype.getPermissions = function() {
+        var board = this.getCurrent();
+        var deferred = $q.defer();
+        $http.get(this.baseUrl + '/' + board.id + '/permissions').then(function (response) {
+            board.permissions = response.data;
+            console.log(board.permissions);
+            deferred.resolve(response.data);
+        }, function (error) {
+            deferred.reject('Error fetching board permissions ' + board);
+        });
+    };
+
+    BoardService.prototype.canRead = function() {
+        if(!this.getCurrent() || !this.getCurrent().permissions) {
+            return false;
+        }
+        return this.getCurrent().permissions['PERMISSION_READ'];
+    }
+
+    BoardService.prototype.canEdit = function() {
+        if(!this.getCurrent() || !this.getCurrent().permissions) {
+            return false;
+        }
+        return this.getCurrent().permissions['PERMISSION_EDIT'];
+    }
+
+    BoardService.prototype.canManage = function() {
+        if(!this.getCurrent() || !this.getCurrent().permissions) {
+            return false;
+        }
+        return this.getCurrent().permissions['PERMISSION_MANAGE'];
+    }
+
+    BoardService.prototype.canShare = function() {
+        if(!this.getCurrent() || !this.getCurrent().permissions) {
+            return false;
+        }
+        return this.getCurrent().permissions['PERMISSION_SHARE'];
+    }
+
     service = new BoardService($http, 'boards', $q);
     return service;
     

lib/AppInfo/Application.php

@@ -49,6 +49,7 @@ class Application extends App {
 				$container->query('ControllerMethodReflector')
 			);
 		});
+		/** @noinspection PhpMethodOrClassCallIsNotCaseSensitiveInspection */
 		$container->registerMiddleware('SharingMiddleware');
 
 	}

lib/Controller/BoardController.php

@@ -23,6 +23,7 @@
 
 namespace OCA\Deck\Controller;
 
+use OCA\Deck\Db\Acl;
 use OCA\Deck\Service\BoardService;
 
 use OCP\IRequest;
@@ -121,6 +122,33 @@ class BoardController extends Controller {
         return $this->boardService->labels($boardId);
     }
 
+	/**
+	 * @NoAdminRequired
+	 * @RequireReadPermission
+	 * @param $boardId
+	 * @return array|bool
+	 * @internal param $userId
+	 */
+	public function getUserPermissions($boardId) {
+		$board = $this->boardService->find($boardId);
+		if($this->userId === $board->getOwner()) {
+			return [
+				'PERMISSION_READ' => true,
+				'PERMISSION_EDIT' => true,
+				'PERMISSION_MANAGE' => true,
+				'PERMISSION_SHARE' => true,
+			];
+		}
+
+		return [
+			'PERMISSION_READ' => $this->boardService->getPermission($boardId, $this->userId, Acl::PERMISSION_READ),
+			'PERMISSION_EDIT' => $this->boardService->getPermission($boardId, $this->userId, Acl::PERMISSION_EDIT),
+			'PERMISSION_MANAGE' => $this->boardService->getPermission($boardId, $this->userId, Acl::PERMISSION_MANAGE),
+			'PERMISSION_SHARE' => $this->boardService->getPermission($boardId, $this->userId, Acl::PERMISSION_SHARE),
+		];
+
+	}
+
 	/**
 	 * @NoAdminRequired
 	 * @RequireManagePermission

lib/Controller/ShareController.php

@@ -24,6 +24,8 @@
 namespace OCA\Deck\Controller;
 
 use OCA\Deck\Db\Acl;
+
+use OCA\Deck\Service\BoardService;
 use OCP\IGroupManager;
 use OCP\IRequest;
 use OCP\AppFramework\Controller;
@@ -31,20 +33,23 @@ use OCP\IUserManager;
 
 class ShareController extends Controller {
 
-    protected $userManager;
+    private $userManager;
-    protected $groupManager;
+    private $groupManager;
+	private $boardService;
     private $userId;
 
     public function __construct($appName,
                                 IRequest $request,
                                 IUserManager $userManager,
                                 IGroupManager $groupManager,
+								BoardService $boardService,
                                 $userId
     ){
         parent::__construct($appName, $request);
         $this->userManager = $userManager;
         $this->groupManager = $groupManager;
         $this->userId = $userId;
+		$this->boardService = $boardService;
 
     }
 
@@ -81,4 +86,8 @@ class ShareController extends Controller {
         }
         return $result;
     }
+
+
+
+
 }

lib/Db/BoardMapper.php

@@ -42,9 +42,11 @@ class BoardMapper extends DeckMapper implements IPermissionMapper {
 
 	/**
 	 * @param $id
+	 * @param bool $withLabels
+	 * @param bool $withAcl
 	 * @return \OCP\AppFramework\Db\Entity if not found
 	 */
-    public function find($id) {
+    public function find($id, $withLabels=false, $withAcl=false) {
         $sql = 'SELECT id, title, owner, color, archived FROM `*PREFIX*deck_boards` ' .
             'WHERE `id` = ?';
         $board = $this->findEntity($sql, [$id]);
@@ -95,13 +97,12 @@ class BoardMapper extends DeckMapper implements IPermissionMapper {
         }
         $sql = 'SELECT boards.id, title, owner, color, archived, 2 as shared FROM oc_deck_boards as boards ' .
             'INNER JOIN oc_deck_board_acl as acl ON boards.id=acl.board_id WHERE owner != ? AND type=\'group\' AND (';
-        $countGroups = 0;
+		for($i=0;$i<count($groups);$i++) {
-		// FIXME: group unused?
+			$sql .= 'acl.participant = ? ';
-        foreach ($groups as $group) {
+			if(count($groups)>1 && $i<count($groups)-1) {
-            $sql .= 'acl.participant = ? ';
+				$sql .= ' OR ';
-            if(count($groups)>1 && $countGroups++<count($groups)-1)
+			}
-                $sql .= ' OR ';
+		}
-        }
         $sql .= ');';
         $entries = $this->findEntities($sql,  array_merge([$userId], $groups), $limit, $offset);
         /* @var Board $entry */
@@ -112,7 +113,8 @@ class BoardMapper extends DeckMapper implements IPermissionMapper {
         return $entries;
     }
 
-    public function delete(\OCP\AppFramework\Db\Entity $entity) {
+    public function delete(/** @noinspection PhpUnnecessaryFullyQualifiedNameInspection */
+		\OCP\AppFramework\Db\Entity $entity) {
     	// delete acl
 		$acl = $this->aclMapper->findAll($entity->getId());
 		foreach ($acl as $item) {

lib/Db/CardMapper.php

@@ -25,8 +25,6 @@ namespace OCA\Deck\Db;
 
 use OCP\AppFramework\Db\Entity;
 use OCP\IDb;
-use OCP\AppFramework\Db\Mapper;
-
 
 
 class CardMapper extends DeckMapper implements IPermissionMapper {

lib/Db/DeckMapper.php

@@ -51,6 +51,8 @@ abstract class DeckMapper extends Mapper {
 
 	protected function execute($sql, array $params = [], $limit = null, $offset = null) {
 		// FIXME: remove on release
+		/** @noinspection PhpUnnecessaryFullyQualifiedNameInspection */
+		/** @noinspection PhpUnnecessaryFullyQualifiedNameInspection */
 		\OCP\Util::writeLog('deck', "DeckMapper SQL: " . $sql . " with " . implode("|", $params), \OCP\Util::DEBUG);
 		return parent::execute($sql, $params, $limit, $offset);
 	}

lib/Db/StackMapper.php

@@ -25,7 +25,6 @@ namespace OCA\Deck\Db;
 
 use OCP\AppFramework\Db\Entity;
 use OCP\IDb;
-use OCP\AppFramework\Db\Mapper;
 
 
 class StackMapper extends DeckMapper implements IPermissionMapper {

lib/Middleware/SharingMiddleware.php

@@ -27,9 +27,11 @@ use OCA\Deck\Controller\BoardController;
 use OCA\Deck\Controller\CardController;
 use OCA\Deck\Controller\LabelController;
 use OCA\Deck\Controller\PageController;
-use OCA\Deck\Controller\ShareController;
+
+
 use OCA\Deck\NoPermissionException;
 use OCA\Deck\NotFoundException;
+
 use \OCP\AppFramework\Middleware;
 use OCP\IContainer;
 use OCP\IRequest;
@@ -47,6 +49,7 @@ class SharingMiddleware extends Middleware {
 	private $reflector;
 	private $groupManager;
 	private $aclMapper;
+	private $boardService;
 
 
 	public function __construct(
@@ -61,6 +64,7 @@ class SharingMiddleware extends Middleware {
 		$this->reflector = $reflector;
 		$this->aclMapper = $this->container->query('OCA\Deck\Db\AclMapper');
 		$this->groupManager = $this->container->query('\OCP\IGroupManager');
+		$this->boardService = $this->container->query('OCA\Deck\Service\BoardService');
 	}
 
 	/**
@@ -117,8 +121,7 @@ class SharingMiddleware extends Middleware {
 		$mapper = null;
 		$id = null;
 
-		// FIXME: ShareController#search should be limited to board users/groups
+		if ($controller instanceof BoardController) {
-		if ($controller instanceof BoardController or $controller instanceof ShareController) {
 			$mapper = $this->container->query('OCA\Deck\Db\BoardMapper');
 			$id = $params['boardId'];
 		}
@@ -198,29 +201,12 @@ class SharingMiddleware extends Middleware {
 		if ($mapper->isOwner($userId, $id)) {
 			return true;
 		}
-		
 		// find related board
 		$boardId = $mapper->findBoardId($id);
 		if(!$boardId) {
 			throw new NotFoundException("Entity not found");
 		}
-		// check if is in acl
+		return $this->boardService->getPermission($boardId, $userId, $permission);
-
-		$acls = $this->aclMapper->findAll($boardId);
-		// check for users
-		foreach ($acls as $acl) {
-			if ($acl->getType() === "user" && $acl->getParticipant() === $userId) {
-				return $acl->getPermission($permission);
-			}
-		}
-		// check for groups
-		$hasGroupPermission = false;
-		foreach ($acls as $acl) {
-			if (!$hasGroupPermission && $acl->getType() === "group" && $this->groupManager->isInGroup($userId, $acl->getParticipant())) {
-				$hasGroupPermission = $acl->getPermission($permission);
-			}
-		}
-		return $hasGroupPermission;
 	}
 
 	/**

lib/Service/BoardService.php

@@ -26,6 +26,7 @@ namespace OCA\Deck\Service;
 use OCA\Deck\Db\Acl;
 use OCA\Deck\Db\AclMapper;
 use OCA\Deck\Db\Label;
+use OCP\IGroupManager;
 use OCP\ILogger;
 use OCP\IL10N;
 
@@ -33,6 +34,7 @@ use OCP\IL10N;
 use \OCA\Deck\Db\Board;
 use \OCA\Deck\Db\BoardMapper;
 use \OCA\Deck\Db\LabelMapper;
+use OCP\IUserManager;
 
 
 class BoardService {
@@ -47,12 +49,16 @@ class BoardService {
                                 ILogger $logger,
                                 IL10N $l10n,
                                 LabelMapper $labelMapper,
-                                AclMapper $aclMapper) {
+                                AclMapper $aclMapper,
+								IUserManager $userManager,
+								IGroupManager $groupManager) {
         $this->boardMapper = $boardMapper;
         $this->labelMapper = $labelMapper;
         $this->aclMapper = $aclMapper;
         $this->logger = $logger;
         $this->l10n = $l10n;
+		$this->userManager = $userManager;
+		$this->groupManager = $groupManager;
     }
 
     public function findAll($userInfo) {
@@ -127,4 +133,22 @@ class BoardService {
         $acl = $this->aclMapper->find($id);
         return $this->aclMapper->delete($acl);
     }
+
+	public function getPermission($boardId, $user, $permission) {
+		$acls = $this->aclMapper->findAll($boardId);
+		// check for users
+		foreach ($acls as $acl) {
+			if ($acl->getType() === "user" && $acl->getParticipant() === $user) {
+				return $acl->getPermission($permission);
+			}
+		}
+		// check for groups
+		$hasGroupPermission = false;
+		foreach ($acls as $acl) {
+			if (!$hasGroupPermission && $acl->getType() === "group" && $this->groupManager->isInGroup($user, $acl->getParticipant())) {
+				$hasGroupPermission = $acl->getPermission($permission);
+			}
+		}
+		return $hasGroupPermission;
+	}
 }

templates/part.board.mainView.php

@@ -7,11 +7,11 @@
 <div id="board-header"
 	 style="background-color: #{{boardservice.getCurrent().color }}; color: {{boardservice.getCurrent().color | textColorFilter }};">
 	<h1>
-		{{ boardservice.data[id].title }}
+		{{ boardservice.getCurrent().title }}
 		<div id="board-actions">
-			<div class="board-action-button" ng-if="filter!='archive'"><a ng-click="switchFilter('archive')" style="opacity:0.5;"><i class="icon icon-archive{{ boardservice.getCurrent().color | iconWhiteFilter }}"></i></a></div>
+			<div class="board-action-button" ng-if="filter!='archive'"><a ng-click="switchFilter('archive')" style="opacity:0.5;" title="<?php p($l->t('Show archived cards')); ?>"><i class="icon icon-archive{{ boardservice.getCurrent().color | iconWhiteFilter }}"></i></a></div>
-			<div class="board-action-button" ng-if="filter=='archive'"><a ng-click="switchFilter('')"><i class="icon icon-archive{{ boardservice.getCurrent().color | iconWhiteFilter }}"></i></a></div>
+			<div class="board-action-button" ng-if="filter=='archive'"><a ng-click="switchFilter('')" title="<?php p($l->t('Hide archived cards')); ?>"><i class="icon icon-archive{{ boardservice.getCurrent().color | iconWhiteFilter }}"></i></a></div>
-			<div class="board-action-button"><a ui-sref="board.detail({ id: id })"><i class="icon icon-details{{ boardservice.getCurrent().color | iconWhiteFilter }}"></i></a>
+			<div class="board-action-button"><a ui-sref="board.detail({ id: id })" title="<?php p($l->t('Board details')); ?>"><i class="icon icon-details{{ boardservice.getCurrent().color | iconWhiteFilter }}"></i></a>
 			</div>
 		</div>
 	</h1>
@@ -40,7 +40,7 @@
 							ng-click="stackservice.delete(s.id)"></button>
 				</div>
 			</h2>
-			<ul data-as-sortable="sortOptions" is-disabled="filter==='archive'" data-ng-model="s.cards"
+			<ul data-as-sortable="sortOptions" is-disabled="!boardservice.canEdit() || filter==='archive'" data-ng-model="s.cards"
 				style="min-height: 40px;">
 				<li class="card as-sortable-item"
 					ng-repeat="c in s.cards"
@@ -61,7 +61,7 @@
 						<div class="app-popover-menu-utils">
 						<button class="card-options icon-more"
 								ng-click="c.status.showMenu=!c.status.showMenu; $event.stopPropagation();"
-								ng-model="card"></button>
+								ng-model="card" ng-if="boardservice.canEdit()"></button>
 						<div class="popovermenu bubble hidden">
 							<ul>
 								<li ng-if="filter!=='archive'">
@@ -98,7 +98,7 @@
 			</ul>
 			<!-- CREATE CARD //-->
 			<div class="card create"
-				 style="background-color:#{{ boardservice.getCurrent().color }};" ng-if="checkCanEdit() && filter!=='archive'">
+				 style="background-color:#{{ boardservice.getCurrent().color }};" ng-if="boardservice.canEdit() && checkCanEdit() && filter!=='archive'">
 				<form ng-submit="createCard(s.id, newCard.title)">
 					<h3 ng-if="status.addCard[s.id]">
 						<input type="text" autofocus-on-insert
@@ -112,7 +112,7 @@
 				</div>
 			</div>
 		</div>
-		<div class="stack" style="display: inline-block;" ng-if="checkCanEdit()">
+		<div class="stack" style="display: inline-block;" ng-if="boardservice.canEdit() && checkCanEdit()">
 			<form class="ng-pristine ng-valid" ng-submit="createStack()">
 				<h2>
 					<input type="text" placeholder="Add a new stack"

templates/part.board.sidebarView.php

@@ -17,7 +17,7 @@
 <div class="tabsContainer">
     <div id="commentsTabView" class="tab commentsTabView" ng-if="status.boardtab==0 || !status.boardtab">
 
-        <ui-select ng-model="status.addSharee" theme="bootstrap" style="width:100%;" title="Choose a user to assign" placeholder="Assign users ..." on-select="aclAdd(status.addSharee)">
+        <ui-select ng-if="boardservice.canShare()" ng-model="status.addSharee" theme="bootstrap" style="width:100%;" title="Choose a user to assign" placeholder="Assign users ..." on-select="aclAdd(status.addSharee)">
             <ui-select-match placeholder="<?php p($l->t('Select users...')); ?>">
                 <span><i class="icon icon-{{$item.type}}"></i> {{ $item.participant }}</span>
             </ui-select-match>
@@ -45,19 +45,19 @@
 
                 <span class="has-tooltip username">
                     {{ acl.participant }}</span>
-                <span class="shareOption">
+                <span class="shareOption" ng-if="boardservice.canManage()">
                     <input type="checkbox" class="permissions checkbox" id="checkbox-permission-{{ acl.id }}-share" ng-model="acl.permissionInvite" ng-change="aclUpdate(acl)" />
                     <label for="checkbox-permission-{{ acl.id }}-share"><?php p($l->t('Share')); ?></label>
                 </span>
-                <span class="shareOption">
+                <span class="shareOption"ng-if="boardservice.canManage()">
                     <input type="checkbox" class="permissions checkbox" id="checkbox-permission-{{ acl.id }}-edit" ng-model="acl.permissionWrite" ng-change="aclUpdate(acl)" />
                     <label for="checkbox-permission-{{ acl.id }}-edit"><?php p($l->t('Edit')); ?></label>
                 </span>
-                <span class="shareOption">
+                <span class="shareOption"ng-if="boardservice.canManage()">
                     <input type="checkbox" class="permissions checkbox" id="checkbox-permission-{{ acl.id }}-manage" ng-model="acl.permissionManage" ng-change="aclUpdate(acl)" />
                     <label for="checkbox-permission-{{ acl.id }}-manage"><?php p($l->t('Manage')); ?></label>
                 </span>
-                <a class="unshare" ng-click="aclDelete(acl)"><span class="icon-loading-small hidden"></span><span class="icon icon-delete"></span><span class="hidden-visually"><?php p($l->t('Discard share')); ?></span></a>
+                <a ng-if="boardservice.canManage()" class="unshare" ng-click="aclDelete(acl)"><span class="icon-loading-small hidden"></span><span class="icon icon-delete"></span><span class="hidden-visually"><?php p($l->t('Discard share')); ?></span></a>
             </li>
         </ul>
 
@@ -66,7 +66,7 @@
 
             <ul class="labels">
                 <li ng-repeat="label in boardservice.getCurrent().labels">
-                <span class="label-title" style="background-color:#{{label.color}}; color:{{ label.color|textColorFilter }};" ng-if="!label.edit" ng-click="label.edit=true">
+                <span class="label-title" style="background-color:#{{label.color}}; color:{{ label.color|textColorFilter }};" ng-if="!label.edit">
                     <span ng-if="label.title">{{ label.title }}</span><i ng-if="!label.title"><br /></i>
                 </span>
                 <span class="label-title" style="background-color:#{{label.color}}; color:{{ textColor(label.color) }}; width:178px;" ng-if="label.edit">
@@ -77,9 +77,9 @@
                     <div class="colorselect" ng-if="label.edit">
                         <div class="color" ng-repeat="c in defaultColors" style="background-color:#{{ c }};" ng-click="label.color=c" ng-class="{'selected': (c == label.color) }"><br /></div>
                     </div>
-                    <a ng-click="labelDelete(label)" class="icon"><i class="icon icon-delete" ></i></a>
+                    <a ng-if="boardservice.canManage()" ng-click="labelDelete(label)" class="icon"><i class="icon icon-delete" ></i></a>
-                    <a ng-click="labelUpdate(label)" ng-if="label.edit" class="icon"><i class="icon icon-checkmark" ></i></a>
+                    <a ng-if="boardservice.canManage() && label.edit" ng-click="labelUpdate(label)" class="icon"><i class="icon icon-checkmark" ></i></a>
-                    <a ng-click="label.edit=true" ng-if="!label.edit" class="icon"><i class="icon icon-rename" ></i></a>
+                    <a ng-if="boardservice.canManage() && !label.edit" ng-click="label.edit=true" class="icon"><i class="icon icon-rename" ></i></a>
 
                 </li>
                 <li ng-if="status.createLabel">
@@ -95,7 +95,7 @@
 
                     </form>
                 </li>
-                <li ng-if="!status.createLabel" class="label-create">
+                <li ng-if="boardservice.canManage() && !status.createLabel" class="label-create">
                     <a ng-click="status.createLabel=true"><span class="icon icon-add"> </span> <?php p($l->t('Create a new label')); ?></a>
                 </li>
             </ul>

templates/part.card.php

@@ -34,7 +34,7 @@
 				   style="width:100%;" title="Choose a label"
 				   placeholder="Add a label"
 				   on-select="labelAssign($item, $model)"
-				   on-remove="labelRemove($item, $model)" ng-disabled="archived">
+				   on-remove="labelRemove($item, $model)" ng-disabled="!boardservice.canEdit() || archived">
 			<ui-select-match placeholder="Select labels..."><span
 					class="select-label"
 					style="background-color:#{{$item.color}}">{{$item.title}}&nbsp;</span>

templates/part.navigation.php

@@ -7,18 +7,15 @@
 		<a href="#/board/{{b.id}}/" ng-if="!b.status.edit">{{ b.title }}</a>
 		<div class="app-navigation-entry-utils" ng-show="!b.status.edit" style="position:absolute;">
 			<ul>
-				<li class="app-navigation-entry-utils-menu-share svg" ng-show="b.shared>0"><i class="icon icon-share"> </i></li>
+				<li class="app-navigation-entry-utils-menu-share svg" ng-show="b.shared>0"><i class="icon icon-share" title="<?php p($l->t('Shared with you')); ?>"> </i></li>
 				<li class="app-navigation-entry-utils-menu-button svg"><button class="icon-more"></button></li>
 			</ul>
 		</div>
 		<div class="app-navigation-entry-menu app-navigation-noclose" ng-show="!b.status.edit">
 			<ul>
-				<!--
+				<li ng-show="b.owner===user"><button class="icon-rename svg" title="<?php p($l->t('edit')); ?>" ng-click="b.status.edit=true"></button></li>
-					TODO: Link to board sharing details
+				<li ng-show="b.owner===user"><button class="icon-delete svg" title="<?php p($l->t('delete')); ?>" ng-click="boardDelete(b)"></button></li>
-					<li><button class="icon-share svg" title="share"></button></li>
+				<li ng-show="b.owner!==user"><button class="icon-delete svg" title="<?php p($l->t('remove share')); ?>" ng-click="boardRemoveShare(b)"></button></li>
-				//-->
-				<li><button class="icon-rename svg" title="rename" ng-click="b.status.edit=true"></button></li>
-				<li><button class="icon-delete svg" title="delete" ng-click="boardDelete(b)"></button></li>
 			</ul>
 		</div>
 		<div class="app-navigation-entry-deleted" ng-show="false">
@@ -36,7 +33,6 @@
 		</div>
 	</li>
 
-	<!-- Add new Board //-->
 	<li>
 		<a ng-click="status.addBoard=!status.addBoard" ng-show="!status.addBoard" class="icon-add app-navigation-noclose">
 			<?php p($l->t('Create a new board')); ?>