fix frontend acl

This commit is contained in:
yuri
2018-04-20 13:56:09 +03:00
parent 436f871be2
commit 6d06f03ef9
2 changed files with 14 additions and 3 deletions
+1 -1
View File
@@ -156,7 +156,7 @@ Espo.define('acl-manager', ['acl'], function (Acl) {
},
checkInTeam: function (model) {
return this.getImplementation(model.name).checkIsOwner(model);
return this.getImplementation(model.name).checkInTeam(model);
},
checkAssignmentPermission: function (user) {
+13 -2
View File
@@ -170,14 +170,24 @@ Espo.define('acl', [], function () {
},
checkIsOwner: function (model) {
var result = false;
if (model.hasField('assignedUser')) {
if (this.getUser().id === model.get('assignedUserId')) {
return true;
} else {
if (!model.has('assignedUserId')) {
result = null;
}
}
} else {
if (model.hasField('createdBy')) {
if (this.getUser().id === model.get('createdById')) {
return true;
} else {
if (!model.has('createdById')) {
result = null;
}
}
}
}
@@ -189,10 +199,12 @@ Espo.define('acl', [], function () {
if (~(model.get('assignedUsersIds') || []).indexOf(this.getUser().id)) {
return true;
} else {
result = false;
}
}
return false;
return result;
},
checkInTeam: function (model) {
@@ -220,4 +232,3 @@ Espo.define('acl', [], function () {
return Acl;
});