From 9a19e0c141a37db6ffc0cf21fa5d6b1e73cd9be6 Mon Sep 17 00:00:00 2001 From: brantje Date: Tue, 4 Oct 2016 15:14:31 +0200 Subject: [PATCH] Frontend loads sharing acl --- js/app/controllers/share.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/js/app/controllers/share.js b/js/app/controllers/share.js index 38855deb..af778e20 100644 --- a/js/app/controllers/share.js +++ b/js/app/controllers/share.js @@ -109,8 +109,10 @@ angular.module('passmanApp') userId: acl.user_id, displayName: acl.user_id, type: 'user', - acl: new SharingACL(acl.permissions) + acl: new SharingACL(acl.permissions), + acl_id: acl.acl_id }; + $scope.share_settings.credentialSharedWithUserAndGroup.push(obj); } @@ -179,7 +181,7 @@ angular.module('passmanApp') for (var i = 0; i < list.length; i++) { var iterator = i; // Keeps it available inside the promises callback - if (list[i].type == "user") { + if (list[i].type == "user" && !list[i].hasOwnProperty('acl_id')) { ShareService.getVaultsByUser(list[i].userId).then(function (data) { $scope.share_settings.cypher_progress.total += data.length;