From: Matthias Schmidt <gravatronics@live.com>
Date: Sat, 5 Aug 2017 10:29:39 +0000 (+0200)
Subject: Add notification links to notification tests
X-Git-Tag: 3.1.0_Alpha_1~99
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2fc5228f8a24347c839bea716e195c90ebd1c9d0;p=GitHub%2FWoltLab%2FWCF.git

Add notification links to notification tests

See #2359
---

diff --git a/wcfsetup/install/files/acp/templates/devtoolsNotificationTestDialog.tpl b/wcfsetup/install/files/acp/templates/devtoolsNotificationTestDialog.tpl
index fc7fc58a77..06bc836afa 100644
--- a/wcfsetup/install/files/acp/templates/devtoolsNotificationTestDialog.tpl
+++ b/wcfsetup/install/files/acp/templates/devtoolsNotificationTestDialog.tpl
@@ -31,6 +31,18 @@
 				</dl>
 			{/if}
 			
+			{if $event[link]|isset}
+				<dl>
+					<dt>{lang}wcf.acp.devtools.notificationTest.link{/lang}</dt>
+					<dd><a href="{@$event[link]}">{@$event[link]}</a></dd>
+				</dl>
+			{else}
+				<dl>
+					<dt>{lang}wcf.acp.devtools.notificationTest.link.exception{/lang}</dt>
+					<dd><pre>{$event[linkException]}</pre></dd>
+				</dl>
+			{/if}
+			
 			{if $hasEmailSupport}
 				{if $event[instantEmail]|isset}
 					<dl>
@@ -82,6 +94,17 @@
 	</dl>
 </section>
 
+<section class="section notificationTestSection" id="notificationTestLinkSection" style="display: none;">
+	<h2 class="sectionTitle">{lang}wcf.acp.devtools.notificationTest.links{/lang}</h2>
+	
+	<dl>
+		{foreach from=$events item=event}
+			<dt>{$event[description]}</dt>
+			<dd>{if $event[link]|isset}<a href="{@$event[link]}">{@$event[link]}</a>{else}<pre>{$event[linkException]}</pre>{/if}</dd>
+		{/foreach}
+	</dl>
+</section>
+
 {if $hasEmailSupport}
 	<section class="section notificationTestSection" id="notificationTestInstantEmailSection" style="display: none;">
 		<h2 class="sectionTitle">{lang}wcf.acp.devtools.notificationTest.instantEmails{/lang}</h2>
@@ -110,6 +133,7 @@
 	<button class="small buttonPrimary" id="notificationTestAllSectionButton">{lang}wcf.acp.devtools.notificationTest.button.showAll{/lang}</button>
 	<button class="small button" id="notificationTestTitleSectionButton">{lang}wcf.acp.devtools.notificationTest.titles{/lang}</button>
 	<button class="small button" id="notificationTestMessageSectionButton">{lang}wcf.acp.devtools.notificationTest.messages{/lang}</button>
+	<button class="small button" id="notificationTestLinkSectionButton">{lang}wcf.acp.devtools.notificationTest.links{/lang}</button>
 	{if $hasEmailSupport}
 		<button class="small button" id="notificationTestInstantEmailSectionButton">{lang}wcf.acp.devtools.notificationTest.instantEmails{/lang}</button>
 		<button class="small button" id="notificationTestDailyEmailSectionButton">{lang}wcf.acp.devtools.notificationTest.dailyEmails{/lang}</button>
diff --git a/wcfsetup/install/files/lib/data/user/notification/event/UserNotificationEventAction.class.php b/wcfsetup/install/files/lib/data/user/notification/event/UserNotificationEventAction.class.php
index 7973ade3b5..e875933e4b 100644
--- a/wcfsetup/install/files/lib/data/user/notification/event/UserNotificationEventAction.class.php
+++ b/wcfsetup/install/files/lib/data/user/notification/event/UserNotificationEventAction.class.php
@@ -135,6 +135,18 @@ class UserNotificationEventAction extends AbstractDatabaseObjectAction {
 				$errors++;
 			}
 			
+			try {
+				$eventData['link'] = $event->getLink();
+			}
+			catch (\Exception $e) {
+				$eventData['linkException'] = $getRenderedException($e);
+				$errors++;
+			}
+			catch (\Throwable $e) {
+				$eventData['linkException'] = $getRenderedException($e);
+				$errors++;
+			}
+			
 			if ($event->supportsEmailNotification()) {
 				$hasEmailSupport = true;
 				
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index b091d44c95..fc57763d8c 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -421,6 +421,9 @@
 		<item name="wcf.acp.devtools.notificationTest.messages"><![CDATA[Nachrichten]]></item>
 		<item name="wcf.acp.devtools.notificationTest.instantEmails"><![CDATA[Sofortige E-Mails]]></item>
 		<item name="wcf.acp.devtools.notificationTest.dailyEmails"><![CDATA[Tägliche E-Mails]]></item>
+		<item name="wcf.acp.devtools.notificationTest.link"><![CDATA[Link]]></item>
+		<item name="wcf.acp.devtools.notificationTest.link.exception"><![CDATA[Link-Fehlermeldung]]></item>
+		<item name="wcf.acp.devtools.notificationTest.links"><![CDATA[Links]]></item>
 	</category>
 	
 	<category name="wcf.acp.email">
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index fe3ddc51e9..617cca4277 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -404,6 +404,9 @@
 		<item name="wcf.acp.devtools.notificationTest.messages"><![CDATA[Messages]]></item>
 		<item name="wcf.acp.devtools.notificationTest.instantEmails"><![CDATA[Instant Emails]]></item>
 		<item name="wcf.acp.devtools.notificationTest.dailyEmails"><![CDATA[Daily Emails]]></item>
+		<item name="wcf.acp.devtools.notificationTest.link"><![CDATA[Link]]></item>
+		<item name="wcf.acp.devtools.notificationTest.link.exception"><![CDATA[Link Error Message]]></item>
+		<item name="wcf.acp.devtools.notificationTest.links"><![CDATA[Links]]></item>
 	</category>
 	
 	<category name="wcf.acp.email">