From 771f837fc5c88c5b75719b853cd914f1f6545c78 Mon Sep 17 00:00:00 2001 From: Claire Lozano Date: Mon, 9 Apr 2018 16:06:58 +0200 Subject: [PATCH] Documents in a folder should be shared with its group by default - It works --- .../setpermissions/js/setpermissions.js | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/node_modules/oae-core/setpermissions/js/setpermissions.js b/node_modules/oae-core/setpermissions/js/setpermissions.js index 4fc73468076..6500f84a192 100644 --- a/node_modules/oae-core/setpermissions/js/setpermissions.js +++ b/node_modules/oae-core/setpermissions/js/setpermissions.js @@ -59,7 +59,7 @@ define(['jquery', 'oae.core'], function($, oae) { /** * Trigger an event when changes have been made to the visibility settings */ - var savePermissionsChange = function(folderMembers) { + var savePermissionsChange = function(folderMembers, callback) { // Get the items in the share with list var selection = oae.api.util.autoSuggest().getSelection($rootel); @@ -115,6 +115,10 @@ define(['jquery', 'oae.core'], function($, oae) { 'summary': summary, 'visibility': visibility }); + + if (callback) { + return callback(); + } }; /** @@ -129,12 +133,14 @@ define(['jquery', 'oae.core'], function($, oae) { return callback(null, []); } + // Get all members of the folder oae.api.folder.getMembers(folderId, null, null, function(err, members) { if (err) { return callback(err); }; - folderMembers = _.chain(members.results) + // Get out the creator of this resource because he will get right manager anyway + var folderMembers = _.chain(members.results) .map(function(member) { return member.profile; }) .reject(function(member) { return member.id === oae.data.me.id; }) .value(); @@ -180,13 +186,19 @@ define(['jquery', 'oae.core'], function($, oae) { } // Immediately pass the default permissions summary back to the widget caller - setUpAutoSuggest(folderMembers, savePermissionsChange(folderMembers)); + setUpAutoSuggest(folderMembers, function(err) { + if (err) { + return err; + } + + savePermissionsChange(folderMembers); + }); }); }); + $(document).trigger('oae.context.get', 'setpermissions.' + uid); }; setUpSetPermissionsModal(); - }; });