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

refs #6553 changes models #2522

Open
carlossa wants to merge 22 commits from 6553-workerBusiness into dev
pull from: 6553-workerBusiness
merge into: verdnatura:dev
Conversation 0 Commits 22 Files Changed 11 +4 -1
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 41fabecc9b - Show all commits

3
db/versions/11076-blueChico/00-firstScript.sql
View File

@ -20,3 +20,6 @@ INSERT INTO salix.ACL (model,property,accessType,permission,principalType,princi
VALUES ('PayrollCategory','*','*','ALLOW','ROLE','employee');
INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
VALUES ('Worker','__get__business','*','ALLOW','ROLE','employee');
INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
VALUES ('Worker','__create__business','*','ALLOW','ROLE','employee');

2
modules/client/back/models/business.json
View File

@ -33,7 +33,7 @@
"type": "number"
},
"occupationCodeFk" : {
"type": "number"
"type": "string"
},
"workerFk" : {
"type": "number"