diff --git a/db/versions/11019-grayDendro/01-aclLocker.sql b/db/versions/11019-grayDendro/01-aclLocker.sql index 6b3a66817e..7bc8b12a06 100644 --- a/db/versions/11019-grayDendro/01-aclLocker.sql +++ b/db/versions/11019-grayDendro/01-aclLocker.sql @@ -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'); diff --git a/modules/worker/back/models/locker.json b/modules/worker/back/models/locker.json index 1609df32db..335fca5a96 100644 --- a/modules/worker/back/models/locker.json +++ b/modules/worker/back/models/locker.json @@ -15,13 +15,6 @@ "type": "string" } }, - "relations": { - "user": { - "type": "belongsTo", - "model": "VnUser", - "foreignKey": "workerFk" - } - }, "scopes": { "codes": { "fields": ["id","code"] diff --git a/modules/worker/back/models/worker.json b/modules/worker/back/models/worker.json index 6080af77c3..76ad08d09e 100644 --- a/modules/worker/back/models/worker.json +++ b/modules/worker/back/models/worker.json @@ -101,15 +101,6 @@ "foreignKey": "workerFk" } }, - "scopes":{ - "locker": { - "fields":["id","sex"], - "include": { - "relation": "locker", - "scope": {"fields": ["id", "code"]} - } - } - }, "acls":[ { "property": "__get__locker",