verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 63 Releases Wiki Activity

7489-testToMaster #2515

Merged
alexm merged 329 commits from 7489-testToMaster into master 2024-05-28 05:30:19 +00:00
Conversation 0 Commits 329 Files Changed 212 -17
3 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7f4965879c - Show all commits

1
db/versions/11019-grayDendro/01-aclLocker.sql
View File

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

7
modules/worker/back/models/locker.json
View File

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

9
modules/worker/back/models/worker.json
View File

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