7691-testToMaster #2703

Merged
alexm merged 268 commits from 7691-testToMaster into master 2024-07-09 05:38:28 +00:00
3 changed files with 20 additions and 2 deletions
Showing only changes of commit 578b8a2c71 - Show all commits

View File

@ -0,0 +1,9 @@
-- Auto-generated SQL script. Actual values for binary/complex data types may differ - what you see is the default string representation of values.
INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
VALUES ('TrainingCourse','*','*','ALLOW','ROLE','employee');
INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
VALUES ('TrainingCourseType','*','*','ALLOW','ROLE','employee');
INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
VALUES ('TrainingCenter','*','*','ALLOW','ROLE','employee');
INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
VALUES ('Worker','__get_trainingCourse','*','ALLOW','ROLE','employee');

View File

@ -124,6 +124,15 @@
},
"Locker": {
"dataSource": "vn"
},
"TrainingCourse": {
"dataSource": "vn"
},
"TrainingCourseType": {
"dataSource": "vn"
},
"TrainingCenter": {
"dataSource": "vn"
}
}

View File

@ -1,5 +1,5 @@
{
"name": "trainingCourseType",
"name": "TrainingCourseType",
"description": "List of trainings",
"base": "VnModel",
"options": {
@ -27,7 +27,7 @@
},
"trainingCourseType": {
"type": "belongsTo",
"model": "trainingCourseType",
"model": "TrainingCourseType",
"foreignKey": "trainingCourseTypeFk"
},
"centerFk": {