From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Mon, 11 Jul 2011 04:13:04 +0000 (+0200)
Subject: Only show Sone insert notifications if they are enable for the Sone in question.
X-Git-Tag: 0.6.6^2~24
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=1c9f64a1a1aa8098596cc4c092d1074b52f63b60;p=Sone.git

Only show Sone insert notifications if they are enable for the Sone in question.
---

diff --git a/src/main/java/net/pterodactylus/sone/web/WebInterface.java b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
index 0e62f77..054ed53 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -866,7 +866,9 @@ public class WebInterface implements CoreListener {
 	public void soneInserting(Sone sone) {
 		TemplateNotification soneInsertNotification = getSoneInsertNotification(sone);
 		soneInsertNotification.set("soneStatus", "inserting");
-		notificationManager.addNotification(soneInsertNotification);
+		if (sone.getOptions().getBooleanOption("EnableSoneInsertNotifications").get()) {
+			notificationManager.addNotification(soneInsertNotification);
+		}
 	}
 
 	/**
@@ -877,7 +879,9 @@ public class WebInterface implements CoreListener {
 		TemplateNotification soneInsertNotification = getSoneInsertNotification(sone);
 		soneInsertNotification.set("soneStatus", "inserted");
 		soneInsertNotification.set("insertDuration", insertDuration / 1000);
-		notificationManager.addNotification(soneInsertNotification);
+		if (sone.getOptions().getBooleanOption("EnableSoneInsertNotifications").get()) {
+			notificationManager.addNotification(soneInsertNotification);
+		}
 	}
 
 	/**
@@ -885,7 +889,12 @@ public class WebInterface implements CoreListener {
 	 */
 	@Override
 	public void soneInsertAborted(Sone sone, Throwable cause) {
-		notificationManager.addNotification(getSoneInsertNotification(sone).set("soneStatus", "insert-aborted").set("insert-error", cause));
+		TemplateNotification soneInsertNotification = getSoneInsertNotification(sone);
+		soneInsertNotification.set("soneStatus", "insert-aborted");
+		soneInsertNotification.set("insert-error", cause);
+		if (sone.getOptions().getBooleanOption("EnableSoneInsertNotifications").get()) {
+			notificationManager.addNotification(soneInsertNotification);
+		}
 	}
 
 	/**