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

This commit is contained in:
Carlos Jimenez 2018-10-17 09:28:48 +02:00
commit cfc7f1ee83
2 changed files with 17 additions and 7 deletions

View File

@ -1,2 +1,9 @@
ALTER TABLE `vn`.`clientLog` ALTER TABLE `vn`.`clientLog`
CHANGE COLUMN `newInstance` `newInstance` TEXT NULL DEFAULT NULL ; CHANGE COLUMN `newInstance` `newInstance` TEXT NULL DEFAULT NULL ;
ALTER TABLE `vn`.`clientLog`
CHANGE COLUMN `model` `changedModel` TEXT CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci' NULL DEFAULT NULL ,
ADD COLUMN `changedModelId` INT(11) NULL DEFAULT NULL AFTER `newInstance`,
ADD COLUMN `changedModelValue` INT(11) NULL DEFAULT NULL AFTER `changedModelId`;

View File

@ -23,20 +23,23 @@
"type": "String", "type": "String",
"required": true "required": true
}, },
"model": { "changedModel": {
"type": "String", "type": "Object"
"required": true
}, },
"oldInstance": { "oldInstance": {
"type": "Object", "type": "Object"
"required": true
}, },
"newInstance": { "newInstance": {
"type": "Object", "type": "Object"
"required": true
}, },
"creationDate": { "creationDate": {
"type": "Date" "type": "Date"
},
"changedModelId": {
"type": "Number"
},
"changedModelValue": {
"type": "Number"
} }
}, },
"relations": { "relations": {