From 595bdb2233c497d4ca5a1e5332e92ad33650f2c7 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 21 Nov 2017 07:49:11 +0000
Subject: [PATCH] SSDM-5724: bugs in JS files fixed
SVN: 38924
---
.../api/v3/as/dto/roleassignment/RoleAssignment.js | 2 ++
.../fetchoptions/RoleAssignmentFetchOptions.js | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/roleassignment/RoleAssignment.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/roleassignment/RoleAssignment.js
index 54674dc2d8c..78b388a319d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/roleassignment/RoleAssignment.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/roleassignment/RoleAssignment.js
@@ -77,6 +77,8 @@ define([ "stjs", "util/Exceptions" ], function(stjs, exceptions) {
}, {
fetchOptions : "RoleAssignmentFetchOptions",
id : "IRoleAssignmentId",
+ user : "Person",
+ authorizationGroup : "AuthorizationGroup",
role : "Role",
roleLevel : "RoleLevel",
space : "Space",
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/roleassignment/fetchoptions/RoleAssignmentFetchOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/roleassignment/fetchoptions/RoleAssignmentFetchOptions.js
index b9ba61e3019..4ab430f4922 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/roleassignment/fetchoptions/RoleAssignmentFetchOptions.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/roleassignment/fetchoptions/RoleAssignmentFetchOptions.js
@@ -19,13 +19,13 @@ define([ "require", "stjs", "as/dto/common/fetchoptions/FetchOptions", "as/dto/p
}
return this.user;
}
- prototype withUserUsing = function(fetchOptions) {
+ prototype.withUserUsing = function(fetchOptions) {
return this.user = fetchOptions;
}
- prototype hasUser = function() {
+ prototype.hasUser = function() {
return this.user != null;
}
- prototype withAuthorizationGroup = function() {
+ prototype.withAuthorizationGroup = function() {
if (this.authorizationGroup == null) {
var AuthorizationGroupFetchOptions = require("as/dto/authorizationgroup/fetchoptions/AuthorizationGroupFetchOptions");
this.authorizationGroup = new AuthorizationGroupFetchOptions();
--
GitLab