From e474abbc3ae29331abbfc2ec0296149456a29698 Mon Sep 17 00:00:00 2001 From: Carlos Jimenez Ruiz Date: Wed, 22 May 2019 11:59:07 +0200 Subject: [PATCH] ACL error fixed --- db/changes/10002-lent/00-ACL.sql | 3 +-- db/changes/10004-mother/00-acl.sql | 19 +++++++++---------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/db/changes/10002-lent/00-ACL.sql b/db/changes/10002-lent/00-ACL.sql index da4ee56bf..b9d71b6b1 100644 --- a/db/changes/10002-lent/00-ACL.sql +++ b/db/changes/10002-lent/00-ACL.sql @@ -1,4 +1,3 @@ INSERT INTO `salix`.`ACL` (`id`, `model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES - ('160', 'TicketServiceType', '*', 'READ', 'ALLOW', 'ROLE', 'employee'), - ('161', 'TicketServiceType', '*', 'WRITE', 'ALLOW', 'ROLE', 'administrative'); + ('160', 'TicketServiceType', '*', 'READ', 'ALLOW', 'ROLE', 'employee'); diff --git a/db/changes/10004-mother/00-acl.sql b/db/changes/10004-mother/00-acl.sql index fca443a69..3e7961061 100644 --- a/db/changes/10004-mother/00-acl.sql +++ b/db/changes/10004-mother/00-acl.sql @@ -1,11 +1,10 @@ -UPDATE `salix`.`ACL` SET principalId ='employee' - WHERE id = 122; -INSERT INTO `salix`.`ACL` (`id`, `model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) - VALUES (167, 'Worker', 'isSubordinate', 'READ', 'ALLOW', 'ROLE', 'employee'); -INSERT INTO `salix`.`ACL` (`id`, `model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) - VALUES (168, 'Worker', 'mySubordinates', 'READ', 'ALLOW', 'ROLE', 'employee'); -INSERT INTO `salix`.`ACL` (`id`, `model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) - VALUES (169, 'WorkerTimeControl', 'filter', 'READ', 'ALLOW', 'ROLE', 'employee'); -INSERT INTO `salix`.`ACL` (`id`, `model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) - VALUES (170, 'WorkerTimeControl', 'addTime', 'WRITE', 'ALLOW', 'ROLE', 'employee'); +UPDATE `salix`.`ACL` SET principalId ='employee' WHERE id = 122; + +INSERT INTO `salix`.`ACL` (`id`, `model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) + VALUES + (167, 'Worker', 'isSubordinate', 'READ', 'ALLOW', 'ROLE', 'employee'), + (168, 'Worker', 'mySubordinates', 'READ', 'ALLOW', 'ROLE', 'employee'), + (169, 'WorkerTimeControl', 'filter', 'READ', 'ALLOW', 'ROLE', 'employee'), + (170, 'WorkerTimeControl', 'addTime', 'WRITE', 'ALLOW', 'ROLE', 'employee'), + (171, 'TicketServiceType', '*', 'WRITE', 'ALLOW', 'ROLE', 'administrative');