Merge branch 'dev' of https://git.verdnatura.es/salix into dev
This commit is contained in:
commit
e81d79610b
|
@ -418,10 +418,10 @@ INSERT INTO `salix`.`user`(`id`,`username`,`password`,`email`)
|
||||||
VALUES
|
VALUES
|
||||||
(10, 'JessicaJones', 'ac754a330530832ba1bf7687f577da91', 'JessicaJones@verdnatura.es');
|
(10, 'JessicaJones', 'ac754a330530832ba1bf7687f577da91', 'JessicaJones@verdnatura.es');
|
||||||
|
|
||||||
INSERT INTO `vn`.`tag`(`id`,`name`,`free`,`isQuantitatif`,`sourceTable`,`unit`)
|
INSERT INTO `vn`.`tag`(`id`,`name`,`isFree`,`isQuantitatif`,`sourceTable`,`unit`)
|
||||||
VALUES
|
VALUES
|
||||||
(1, 'Color', 1, 0, null, null),
|
(1, 'Color', 0, 0, null, null),
|
||||||
(2, 'Power', 1, 0, null, null),
|
(2, 'Power', 0, 0, null, null),
|
||||||
(3, 'Shape', 1, 0, null, null),
|
(3, 'Shape', 1, 0, null, null),
|
||||||
(4, 'Location', 1, 0, null, null),
|
(4, 'Location', 1, 0, null, null),
|
||||||
(5, 'Owner', 1, 1, null, null);
|
(5, 'Owner', 1, 1, null, null);
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
ALTER TABLE `vn`.`tag`
|
||||||
|
CHANGE COLUMN `free` `isFree` TINYINT(1) NOT NULL DEFAULT '1' ;
|
|
@ -32,5 +32,13 @@
|
||||||
"model": "Tag",
|
"model": "Tag",
|
||||||
"foreignKey": "tagFk"
|
"foreignKey": "tagFk"
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
|
"acls": [
|
||||||
|
{
|
||||||
|
"accessType": "READ",
|
||||||
|
"principalType": "ROLE",
|
||||||
|
"principalId": "$everyone",
|
||||||
|
"permission": "ALLOW"
|
||||||
|
}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
"type": "String",
|
"type": "String",
|
||||||
"required": true
|
"required": true
|
||||||
},
|
},
|
||||||
"free": {
|
"isFree": {
|
||||||
"type": "Number"
|
"type": "Number"
|
||||||
},
|
},
|
||||||
"sourceTable": {
|
"sourceTable": {
|
||||||
|
|
Loading…
Reference in New Issue