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

Merge branch 'dev' of http://git.verdnatura.es/salix into dev

This commit is contained in:
Carlos Jimenez 2018-10-04 14:42:53 +02:00
parent af2803deda ea017dde5c
commit 1b1fcb0396
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
services/db/install/changes/1.2-CHECK/05-clientLog.sql Normal file
View File

@ -0,0 +1,10 @@
ALTER TABLE `vn`.`clientLog`
DROP FOREIGN KEY `clientLog_ibfk_2`;
ALTER TABLE `vn`.`clientLog`
CHANGE COLUMN `userFk` `userFk` INT(10) UNSIGNED NULL DEFAULT NULL ;
ALTER TABLE `vn`.`clientLog`
ADD CONSTRAINT `clientLog_ibfk_2`
FOREIGN KEY (`userFk`)
REFERENCES `account`.`user` (`id`)
ON DELETE CASCADE
ON UPDATE CASCADE;

11
services/db/install/changes/1.2-CHECK/06.ACL.sql Normal file
View File

@ -0,0 +1,11 @@
INSERT INTO salix.ACL(id, model, property, accessType, permission, principalType, principalId)
VALUES
(104, 'Item', '*', 'WRITE', 'ALLOW', 'ROLE', 'marketingBoss'),
(105, 'ItemBarcode', '*', 'WRITE', 'ALLOW', 'ROLE', 'marketingBoss'),
(106, 'ItemBotanical', '*', 'WRITE', 'ALLOW', 'ROLE', 'marketingBoss'),
(107, 'ItemNiche', '*', 'WRITE', 'ALLOW', 'ROLE', 'marketingBoss'),
(108, 'ItemPlacement', '*', 'WRITE', 'ALLOW', 'ROLE', 'marketingBoss');
UPDATE salix.ACL
SET model='ItemTag', property='*', accessType='WRITE', permission='ALLOW', principalType='ROLE', principalId='marketingBoss'
WHERE id=52;