diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js index 755d4a9cef5d3f35998342a74069398cc6658935..2a1d14c272d1e13ab99fbbfcc4658a0cc6bfd311 100644 --- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js +++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js @@ -278,6 +278,8 @@ function MainController(profile) { } } callback(roles); + }, function(errorResult) { + callback([]); }); } } diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js index 7d8d2dd53359ebd7ab8559c174acde9f3d215299..e8dd6a389c4772afb46a30dcfeb2ea0507e4c7b6 100644 --- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js +++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js @@ -2401,7 +2401,8 @@ function ServerFacade(openbisServer) { }); } - this.searchRoleAssignments = function(criteriaParams, callbackFunction) { + // errorHandler: optional. if present, it is called instead of showing the error and the callbackFunction is not called + this.searchRoleAssignments = function(criteriaParams, callbackFunction, errorHandler) { require(["as/dto/roleassignment/search/RoleAssignmentSearchCriteria", "as/dto/roleassignment/fetchoptions/RoleAssignmentFetchOptions"], function(RoleAssignmentSearchCriteria, RoleAssignmentFetchOptions) { var criteria = new RoleAssignmentSearchCriteria(); @@ -2424,8 +2425,12 @@ function ServerFacade(openbisServer) { mainController.openbisV3.searchRoleAssignments(criteria, fetchOptions).done(function(result) { callbackFunction(result.objects); }).fail(function(result) { - Util.showError("Call failed to server: " + JSON.stringify(result)); - callbackFunction(false); + if (errorHandler) { + errorHandler(result); + } else { + Util.showError("Call failed to server: " + JSON.stringify(result)); + callbackFunction(false); + } }); }); }