Merge pull request '#7828 makeCorrectCalls' (!2955) from 7828-makeCorrectCalls into dev
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2955 Reviewed-by: Alex Moreno <alexm@verdnatura.es>
This commit is contained in:
commit
f1a8e206b5
|
@ -0,0 +1,4 @@
|
||||||
|
-- Place your SQL code here
|
||||||
|
INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId)
|
||||||
|
VALUES ('WorkerTimeControlMail', 'count', 'READ', 'ALLOW', 'ROLE', 'employee'),
|
||||||
|
('Worker', '__get__mail', 'READ', 'ALLOW', 'ROLE', 'hr');
|
|
@ -32,13 +32,5 @@
|
||||||
"sendedCounter": {
|
"sendedCounter": {
|
||||||
"type": "number"
|
"type": "number"
|
||||||
}
|
}
|
||||||
},
|
}
|
||||||
"acls": [
|
|
||||||
{
|
|
||||||
"accessType": "READ",
|
|
||||||
"principalType": "ROLE",
|
|
||||||
"principalId": "employee",
|
|
||||||
"permission": "ALLOW"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
}
|
|
@ -130,6 +130,11 @@
|
||||||
"type": "hasMany",
|
"type": "hasMany",
|
||||||
"model": "TrainingCourse",
|
"model": "TrainingCourse",
|
||||||
"foreignKey": "workerFk"
|
"foreignKey": "workerFk"
|
||||||
|
},
|
||||||
|
"mail": {
|
||||||
|
"type": "hasMany",
|
||||||
|
"model": "WorkerTimeControlMail",
|
||||||
|
"foreignKey": "workerFk"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"acls": [
|
"acls": [
|
||||||
|
@ -139,6 +144,13 @@
|
||||||
"permission": "ALLOW",
|
"permission": "ALLOW",
|
||||||
"principalType": "ROLE",
|
"principalType": "ROLE",
|
||||||
"principalId": "$owner"
|
"principalId": "$owner"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"property": "__get__mail",
|
||||||
|
"accessType": "READ",
|
||||||
|
"permission": "ALLOW",
|
||||||
|
"principalType": "ROLE",
|
||||||
|
"principalId": "$owner"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"scopes": {
|
"scopes": {
|
||||||
|
|
Loading…
Reference in New Issue