Skip to content

Commit a6f19b5

Browse files
committed
more progress
1 parent 99a9195 commit a6f19b5

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

services/static-webserver/client/source/class/osparc/data/model/Function.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ qx.Class.define("osparc.data.model.Function", {
164164
return osparc.share.CollaboratorsFunction.canGroupsWrite(accessRights, (orgIDs));
165165
}
166166
return false;
167-
}
167+
},
168168
},
169169

170170
members: {

services/static-webserver/client/source/class/osparc/share/Collaborators.js

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ qx.Class.define("osparc.share.Collaborators", {
185185
},
186186

187187
__canIShare: function() {
188-
if (this._resourceType === "study" && this._serializedDataCopy["workspaceId"]) {
188+
if (this._serializedDataCopy["workspaceId"] && this._resourceType === "study") {
189189
// Access Rights are set at workspace level
190190
return false;
191191
}
@@ -198,6 +198,9 @@ qx.Class.define("osparc.share.Collaborators", {
198198
case "hypertool":
199199
canIShare = osparc.data.model.Study.canIWrite(this._serializedDataCopy["accessRights"]);
200200
break;
201+
case "function":
202+
canIShare = osparc.data.model.Function.canIWrite(this._serializedDataCopy["accessRights"]);
203+
break;
201204
case "service":
202205
canIShare = osparc.service.Utils.canIWrite(this._serializedDataCopy["accessRights"]);
203206
break;
@@ -224,6 +227,9 @@ qx.Class.define("osparc.share.Collaborators", {
224227
case "hypertool":
225228
fullOptions = osparc.data.model.Study.canIDelete(this._serializedDataCopy["accessRights"]);
226229
break;
230+
case "function":
231+
fullOptions = osparc.data.model.Function.canIWrite(this._serializedDataCopy["accessRights"]);
232+
break;
227233
case "service":
228234
fullOptions = osparc.service.Utils.canIWrite(this._serializedDataCopy["accessRights"]);
229235
break;
@@ -351,7 +357,13 @@ qx.Class.define("osparc.share.Collaborators", {
351357
item.addListener("removeMember", e => {
352358
const orgMember = e.getData();
353359
if (
354-
["study", "template", "tutorial", "hypertool"].includes(this._resourceType) &&
360+
[
361+
"study",
362+
"template",
363+
"tutorial",
364+
"hypertool",
365+
"function",
366+
].includes(this._resourceType) &&
355367
!osparc.share.CollaboratorsStudy.canCollaboratorBeRemoved(this._serializedDataCopy, orgMember["gid"])
356368
) {
357369
let msg = this.tr("Collaborator can't be removed:");

0 commit comments

Comments
 (0)