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

#5858 - zoneCollisions #1853

Merged
jsegarra merged 78 commits from 5858-zone_Collisions into dev 2024-03-15 12:36:38 +00:00
Conversation 0 Commits 78 Files Changed 16 +159 -159
2 changed files with 159 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e7f6e61ea1 - Show all commits

4
db/dump/fixtures.before.sql
View File

@ -2821,7 +2821,7 @@ INSERT INTO `util`.`notificationAcl` (`notificationFk`, `roleFk`)
(4, 1), (4, 1),
(5, 9), (5, 9),
(6, 9), (6, 9),
(7, 1); (7, 100);
INSERT INTO `util`.`notificationQueue` (`id`, `notificationFk`, `params`, `authorFk`, `status`, `created`) INSERT INTO `util`.`notificationQueue` (`id`, `notificationFk`, `params`, `authorFk`, `status`, `created`)
VALUES VALUES
@ -2839,7 +2839,7 @@ INSERT INTO `util`.`notificationSubscription` (`notificationFk`, `userFk`)
(1, 9), (1, 9),
(1, 3), (1, 3),
(6, 9), (6, 9),
(7, 9); (7, 100);
INSERT INTO `vn`.`routeConfig` (`id`, `defaultWorkCenterFk`) INSERT INTO `vn`.`routeConfig` (`id`, `defaultWorkCenterFk`)
VALUES VALUES

4
db/versions/10881-greenHydrangea/01-notification.vn.sql
View File

@ -4,8 +4,8 @@ INSERT IGNORE INTO util.notification ( `name`,`description`)
SET @MaxId = LAST_INSERT_ID(); SET @MaxId = LAST_INSERT_ID();
INSERT IGNORE INTO util.notificationSubscription (notificationFk,userFk) INSERT IGNORE INTO util.notificationSubscription (notificationFk,userFk)
VALUES( VALUES(
@MaxId, (SELECT id from `account`.`user` where name = "system")); @MaxId, (SELECT id from `account`.`user` where name = "root"));
INSERT IGNORE INTO util.notificationAcl (notificationFk,roleFk) INSERT IGNORE INTO util.notificationAcl (notificationFk,roleFk)
SELECT @MaxId, (SELECT id from `account`.`role` where name = "system") FROM util.notification WHERE name= "zone-included"; SELECT @MaxId, (SELECT id from `account`.`role` where name = "root") FROM util.notification WHERE name= "zone-included";