From a86469ccd28a971139f9ae52c634b5b7d3f2a752 Mon Sep 17 00:00:00 2001 From: sergiodt Date: Thu, 28 Sep 2023 07:42:44 +0200 Subject: [PATCH] refs #5134 fix: format --- db/changes/233401/00-models.sql | 29 ------------------- db/changes/{233401 => 234001}/.gitkeep | 0 db/changes/234001/00-models.sql | 11 +++++++ modules/shelving/back/models/shelving.json | 2 +- modules/ticket/back/model-config.json | 2 +- .../back/models/expeditionMistakeType.json | 7 ++--- modules/worker/back/models/mistakeType.json | 2 +- modules/worker/back/models/workerMistake.json | 8 ++--- 8 files changed, 21 insertions(+), 40 deletions(-) delete mode 100644 db/changes/233401/00-models.sql rename db/changes/{233401 => 234001}/.gitkeep (100%) create mode 100644 db/changes/234001/00-models.sql diff --git a/db/changes/233401/00-models.sql b/db/changes/233401/00-models.sql deleted file mode 100644 index c06965b3f2..0000000000 --- a/db/changes/233401/00-models.sql +++ /dev/null @@ -1,29 +0,0 @@ -INSERT INTO `salix`.`ACL` ( model, property, accessType, permission, principalType, principalId) - VALUES('ExpeditionMistakeType', '*', 'READ', 'ALLOW', 'ROLE', 'employee'); - -INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId) - VALUES('WorkerMistakeType', '*', 'READ', 'ALLOW', 'ROLE', 'employee'); - -INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId) - VALUES ('ExpeditionMistake','*','WRITE','ALLOW','ROLE','employee'); - -INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId) - VALUES('WorkerMistake', '*', 'WRITE', 'ALLOW', 'ROLE', 'coolerBoss'); - -INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId) - VALUES('WorkerMistake', '*', 'WRITE', 'ALLOW', 'ROLE', 'coolerBoss'); - -INSERT INTO `salix`.`ACL` ( model, property, accessType, permission, principalType, principalId) - VALUES('MistakesTypes', '*', 'WRITE', 'ALLOW', 'ROLE', 'coolerBoss'); - -INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId) - VALUES ('MistakeType','*','READ','ALLOW','ROLE','employee'); - -INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId) - VALUES('MachineWorker', '*', 'READ', 'ALLOW', 'ROLE', 'coolerAssist'); - -INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId) - VALUES ('Printer','*','READ','ALLOW','ROLE','employee'); - -INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId) - VALUES( 'SaleMistake', '*', 'WRITE', 'ALLOW', 'ROLE', 'production'); diff --git a/db/changes/233401/.gitkeep b/db/changes/234001/.gitkeep similarity index 100% rename from db/changes/233401/.gitkeep rename to db/changes/234001/.gitkeep diff --git a/db/changes/234001/00-models.sql b/db/changes/234001/00-models.sql new file mode 100644 index 0000000000..51ffa15546 --- /dev/null +++ b/db/changes/234001/00-models.sql @@ -0,0 +1,11 @@ +INSERT INTO `salix`.`ACL` ( model, property, accessType, permission, principalType, principalId) + VALUES + ('ExpeditionMistakeType', '*', 'READ', 'ALLOW', 'ROLE', 'employee'); + ('WorkerMistakeType', '*', 'READ', 'ALLOW', 'ROLE', 'employee'); + ('ExpeditionMistake','*','WRITE','ALLOW','ROLE','employee'); + ('WorkerMistake', '*', 'WRITE', 'ALLOW', 'ROLE', 'coolerBoss'); + ('MistakesTypes', '*', 'WRITE', 'ALLOW', 'ROLE', 'coolerBoss'); + ('MistakeType','*','READ','ALLOW','ROLE','employee'); + ('MachineWorker', '*', 'READ', 'ALLOW', 'ROLE', 'coolerAssist'); + ('Printer','*','READ','ALLOW','ROLE','employee'); + ('SaleMistake', '*', 'WRITE', 'ALLOW', 'ROLE', 'production'); diff --git a/modules/shelving/back/models/shelving.json b/modules/shelving/back/models/shelving.json index bb24016665..8bfcac9a19 100644 --- a/modules/shelving/back/models/shelving.json +++ b/modules/shelving/back/models/shelving.json @@ -10,7 +10,7 @@ "id": { "type": "number", "description": "Identifier", - "id": true + "id": true }, "code": { "type": "string" diff --git a/modules/ticket/back/model-config.json b/modules/ticket/back/model-config.json index 247e18d014..92bd83ac5c 100644 --- a/modules/ticket/back/model-config.json +++ b/modules/ticket/back/model-config.json @@ -36,7 +36,7 @@ "dataSource": "vn" }, "ExpeditionMistakeType": { - "dataSource": "vn" + "dataSource": "vn" }, "PrintServerQueue": { "dataSource": "vn" diff --git a/modules/ticket/back/models/expeditionMistakeType.json b/modules/ticket/back/models/expeditionMistakeType.json index cf997a9639..c7eaa3cac2 100644 --- a/modules/ticket/back/models/expeditionMistakeType.json +++ b/modules/ticket/back/models/expeditionMistakeType.json @@ -7,10 +7,9 @@ } }, "properties": { - "code": { - "id":true, - "type": "string" - + "code": { + "id":true, + "type": "string" }, "description": { "type": "string" diff --git a/modules/worker/back/models/mistakeType.json b/modules/worker/back/models/mistakeType.json index 71d9e47444..c9fe3ee39c 100644 --- a/modules/worker/back/models/mistakeType.json +++ b/modules/worker/back/models/mistakeType.json @@ -7,7 +7,7 @@ } }, "properties": { - "id": { + "id": { "id":true, "type": "number" }, diff --git a/modules/worker/back/models/workerMistake.json b/modules/worker/back/models/workerMistake.json index 47ed95f802..00978761ea 100644 --- a/modules/worker/back/models/workerMistake.json +++ b/modules/worker/back/models/workerMistake.json @@ -7,10 +7,10 @@ } }, "properties": { - "id": { - "id":true, - "type": "number" - }, + "id": { + "id":true, + "type": "number" + }, "userFk": { "type": "number" },