diff --git a/db/changes/230801/00-workerLocker.sql b/db/changes/230801/00-workerLocker.sql index 1fcea50acb..0a72cca1e5 100644 --- a/db/changes/230801/00-workerLocker.sql +++ b/db/changes/230801/00-workerLocker.sql @@ -1,9 +1,15 @@ ALTER TABLE `vn`.`worker` ADD locker INT UNSIGNED NULL UNIQUE; INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES - ('DeviceProduction', '*', '*', 'ALLOW', 'ROLE', 'employee'), - ('DeviceProductionModels', '*', '*', 'ALLOW', 'ROLE', 'employee'), - ('DeviceProductionState', '*', '*', 'ALLOW', 'ROLE', 'employee'), - ('DeviceProductionUser', '*', '*', 'ALLOW', 'ROLE', 'employee'), - ('Worker', 'deallocatePDA', '*', 'ALLOW', 'ROLE', 'employee'), - ('Worker', 'allocatePDA', '*', 'ALLOW', 'ROLE', 'employee'); + ('DeviceProduction', '*', '*', 'ALLOW', 'ROLE', 'hr'), + ('DeviceProductionModels', '*', '*', 'ALLOW', 'ROLE', 'hr'), + ('DeviceProductionState', '*', '*', 'ALLOW', 'ROLE', 'hr'), + ('DeviceProductionUser', '*', '*', 'ALLOW', 'ROLE', 'hr'), + ('DeviceProduction', '*', '*', 'ALLOW', 'ROLE', 'productionAssi'), + ('DeviceProductionModels', '*', '*', 'ALLOW', 'ROLE', 'productionAssi'), + ('DeviceProductionState', '*', '*', 'ALLOW', 'ROLE', 'productionAssi'), + ('DeviceProductionUser', '*', '*', 'ALLOW', 'ROLE', 'productionAssi'), + ('Worker', 'deallocatePDA', '*', 'ALLOW', 'ROLE', 'hr'), + ('Worker', 'allocatePDA', '*', 'ALLOW', 'ROLE', 'hr'), + ('Worker', 'deallocatePDA', '*', 'ALLOW', 'ROLE', 'productionAssi'), + ('Worker', 'allocatePDA', '*', 'ALLOW', 'ROLE', 'productionAssi'); diff --git a/e2e/paths/03-worker/07_pda.spec.js b/e2e/paths/03-worker/07_pda.spec.js index f583a9e4fb..2b743823ec 100644 --- a/e2e/paths/03-worker/07_pda.spec.js +++ b/e2e/paths/03-worker/07_pda.spec.js @@ -7,7 +7,7 @@ describe('Worker pda path', () => { beforeAll(async() => { browser = await getBrowser(); page = browser.page; - await page.loginAndModule('employee', 'worker'); + await page.loginAndModule('hr', 'worker'); await page.accessToSearchResult('employeeNick'); await page.accessToSection('worker.card.pda'); }); diff --git a/modules/worker/front/pda/index.html b/modules/worker/front/pda/index.html index b102f616ab..2f1626ba83 100644 --- a/modules/worker/front/pda/index.html +++ b/modules/worker/front/pda/index.html @@ -10,7 +10,7 @@ icon="delete" vn-tooltip="Deallocate PDA" ng-click="$ctrl.deallocatePDA()" - vn-acl="employee"> + vn-acl="hr, productionAssi"> @@ -21,6 +21,7 @@