From b7f410def843846b512ec2bfb9ecc326ba473221 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 2 Sep 2020 21:03:09 +0300 Subject: [PATCH] Changes for reviewPermissions: support for "" - empty group. Used for users without groups. --- apps/common/main/lib/controller/ReviewChanges.js | 2 +- apps/common/mobile/lib/controller/Collaboration.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/common/main/lib/controller/ReviewChanges.js b/apps/common/main/lib/controller/ReviewChanges.js index d8a79c5cc..3018058b3 100644 --- a/apps/common/main/lib/controller/ReviewChanges.js +++ b/apps/common/main/lib/controller/ReviewChanges.js @@ -481,7 +481,7 @@ define([ checkUserGroups: function(username) { var groups = Common.Utils.UserInfoParser.getParsedGroups(username); - return this.currentUserGroups && groups && (_.intersection(this.currentUserGroups, groups).length>0); + return this.currentUserGroups && groups && (_.intersection(this.currentUserGroups, (groups.length>0) ? groups : [""]).length>0); }, getUserName: function(id){ diff --git a/apps/common/mobile/lib/controller/Collaboration.js b/apps/common/mobile/lib/controller/Collaboration.js index c0df47d38..7ae215ffb 100644 --- a/apps/common/mobile/lib/controller/Collaboration.js +++ b/apps/common/mobile/lib/controller/Collaboration.js @@ -700,7 +700,7 @@ define([ checkUserGroups: function(username) { var groups = Common.Utils.UserInfoParser.getParsedGroups(username); - return _currentUserGroups && groups && (_.intersection(_currentUserGroups, groups).length>0); + return _currentUserGroups && groups && (_.intersection(_currentUserGroups, (groups.length>0) ? groups : [""]).length>0); }, dateToLocaleTimeString: function (date) {