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

7152-devToTest_2414 #2228

Merged
alexm merged 636 commits from 7152-devToTest_2414 into test 2024-03-28 08:26:34 +00:00
Conversation 0 Commits 636 Files Changed 209 +5 -4
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8276765225 - Show all commits

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

@ -1,11 +1,12 @@
INSERT IGNORE INTO util.notification ( `name`,`description`) INSERT IGNORE INTO util.notification ( `name`,`description`)
VALUES VALUES
( 'zone-included','An email to notify zoneCollisions'); ( 'zone-included','An email to notify zoneCollisions');
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 = "root")); @MaxId, (SELECT id from `account`.`user` where name = "pepe"));
INSERT IGNORE INTO util.notificationAcl (notificationFk,roleFk) INSERT IGNORE INTO util.notificationAcl (notificationFk,roleFk)
SELECT @MaxId, (SELECT id from `account`.`role` where name = "root") FROM util.notification WHERE name= "zone-included"; SELECT @MaxId, (SELECT role from `account`.`user` where name = "pepe") FROM util.notification WHERE name= "zone-included";

2
print/templates/email/zone-included/locale/es.yml
View File

@ -1,4 +1,4 @@
subject: Colisión de zona detectada subject: Colisiones en zonas
title: "La zona {0} y localización {1} ha sido registrada en más de un sitio" title: "La zona {0} y localización {1} ha sido registrada en más de un sitio"
postalCode: C. Postal postalCode: C. Postal
zoneFk: Número de zona zoneFk: Número de zona