verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

#5666 - Loggable to mixin #1826

Merged
alexm merged 29 commits from 5666-loggable_to_mixin into dev 2024-01-04 09:21:57 +00:00
Conversation 0 Commits 29 Files Changed 92 +15 -19
3 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2fe631f078 - Show all commits

12
back/model-config.json
View File

@ -139,12 +139,6 @@
"Warehouse": {
"dataSource": "vn"
},
"VnUser": {
"dataSource": "vn"
},
"VnRole": {
"dataSource": "vn"
},
"OsTicket": {
"dataSource": "osticket"
},
@ -159,6 +153,12 @@
},
"ViaexpressConfig": {
"dataSource": "vn"
},
"VnUser": {
"dataSource": "vn"
},
"VnRole": {
"dataSource": "vn"
}
}

14
db/changes/235001/00-updateACL_Role_VnRole.sql
View File

@ -1,8 +1,12 @@
-- Auto-generated SQL script #202311301038
INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId)
VALUES ('VnRole','*','*','ALLOW','ROLE','$everyone');
INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId)
VALUES ('VnRole','*','*','ALLOW','ROLE','employee');
-- INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId)
-- VALUES ('VnRole','*','*','ALLOW','ROLE','$everyone');
-- INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId)
-- VALUES ('VnRole','*','*','ALLOW','ROLE','employee');
INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId) VALUES
('VnRole','*','READ','ALLOW','ROLE','employee'),
('VnRole','*','WRITE','ALLOW','ROLE','it');
-- Auto-generated SQL script #202311301203
UPDATE `salix`.`ACL` SET permission='DENY' WHERE model='Role';
DELETE FROM`salix`.`ACL` WHERE model='Role';

8
loopback/server/model-config.json
View File

@ -25,14 +25,6 @@
"FieldAcl": {
"dataSource": "vn"
},
"Role": {
"dataSource": "vn",
"options": {
"mysql": {
"table": "salix.Role"
}
}
},
"RoleMapping": {
"dataSource": "vn",
"options": {