From b1e58396d19e4764ca74ea4429dc425fd479b0ce Mon Sep 17 00:00:00 2001 From: jendib Date: Mon, 9 May 2016 21:53:15 +0200 Subject: [PATCH] Closes #98: Fix inherited permissions table --- .../src/test/java/com/sismics/docs/rest/util/ClientUtil.java | 2 +- .../src/app/docs/controller/document/DocumentViewPermissions.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs-web-common/src/test/java/com/sismics/docs/rest/util/ClientUtil.java b/docs-web-common/src/test/java/com/sismics/docs/rest/util/ClientUtil.java index 968f9adb..db201e34 100644 --- a/docs-web-common/src/test/java/com/sismics/docs/rest/util/ClientUtil.java +++ b/docs-web-common/src/test/java/com/sismics/docs/rest/util/ClientUtil.java @@ -69,7 +69,7 @@ public class ClientUtil { * Creates a group. * * @param name Name - * @param parent Parent + * @param parentId Parent ID */ public void createGroup(String name, String parentId) { // Login admin to create the group diff --git a/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentViewPermissions.js b/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentViewPermissions.js index 453605df..fe3a5b75 100644 --- a/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentViewPermissions.js +++ b/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentViewPermissions.js @@ -7,7 +7,7 @@ angular.module('docs').controller('DocumentViewPermissions', function($scope) { // Watch for ACLs change and group them for easy displaying $scope.$watch('document.inherited_acls', function(acls) { $scope.inheritedAcls = _.groupBy(acls, function(acl) { - return acl.source_id; + return acl.source_id + acl.id; }); }); }); \ No newline at end of file