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

This commit is contained in:
Juan Ferrer Toribio 2018-02-12 13:17:00 +01:00
commit 4c76718bce
2 changed files with 22 additions and 1 deletions

View File

@ -24,5 +24,6 @@
<vn-two pad-medium-h></vn-two>
<vn-one pad-medium-h></vn-one>
</vn-horizontal>
<vn-paging margin-large-top vn-one index="index" total="index.model.count"></vn-paging>
</vn-vertical>
</vn-card>

View File

@ -656,4 +656,24 @@ INSERT INTO `vn`.`itemTag`(`id`,`itemFk`,`tagFk`,`value`,`priority`)
INSERT INTO `vn`.`itemLog` (`id`, `originFk`, `userFk`, `action`, `description`)
VALUES
('1', '1', '1', 'insert', 'We made an change!');
(1, 1, 1, 'insert', 'insert change was made!'),
(2, 1, 1, 'delete', 'delete change was made!'),
(3, 1, 1, 'update', 'update change was made!'),
(4, 1, 1, 'insert', 'insert change was made!'),
(5, 1, 1, 'delete', 'delete change was made!'),
(6, 1, 1, 'update', 'update change was made!'),
(7, 1, 1, 'insert', 'insert change was made!'),
(8, 1, 1, 'delete', 'delete change was made!'),
(9, 1, 1, 'update', 'update change was made!'),
(10, 1, 1, 'insert', 'insert change was made!'),
(11, 1, 1, 'delete', 'delete change was made!'),
(12, 1, 1, 'insert', 'insert change was made!'),
(13, 1, 1, 'delete', 'delete change was made!'),
(14, 1, 1, 'update', 'update change was made!'),
(15, 1, 1, 'insert', 'insert change was made!'),
(16, 1, 1, 'delete', 'delete change was made!'),
(17, 1, 1, 'update', 'update change was made!'),
(18, 1, 1, 'insert', 'insert change was made!'),
(19, 1, 1, 'delete', 'delete change was made!'),
(20, 1, 1, 'delete', 'delete change was made!'),
(21, 1, 1, 'update', 'update change was made!');