7430_devToTest #2490

Merged
alexm merged 306 commits from 7430_devToTest into test 2024-05-21 09:15:04 +00:00
3 changed files with 0 additions and 17 deletions
Showing only changes of commit 7f4965879c - Show all commits

View File

@ -3,5 +3,4 @@ INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `pri
('Locker', '*', '*', 'ALLOW', 'ROLE', 'hr'),
('Locker', '*', '*', 'ALLOW', 'ROLE', 'productionBoss'),
('Worker', '__get__locker', 'READ', 'ALLOW', 'ROLE', 'hr'),
('Worker', '__get__locker', 'READ', 'ALLOW', 'ROLE', 'productionBoss'),
('Worker', '__get__locker', 'READ', 'ALLOW', 'ROLE', 'productionBoss');

View File

@ -15,13 +15,6 @@
"type": "string"
}
},
"relations": {
"user": {
"type": "belongsTo",
"model": "VnUser",
"foreignKey": "workerFk"
}
},
"scopes": {
"codes": {
"fields": ["id","code"]

View File

@ -101,15 +101,6 @@
"foreignKey": "workerFk"
}
},
"scopes":{
"locker": {
"fields":["id","sex"],
"include": {
"relation": "locker",
"scope": {"fields": ["id", "code"]}
}
}
},
"acls":[
{
"property": "__get__locker",