Only show Sone insert notifications if they are enable for the Sone in question.
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 11 Jul 2011 04:13:04 +0000 (06:13 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 11 Jul 2011 04:13:04 +0000 (06:13 +0200)
src/main/java/net/pterodactylus/sone/web/WebInterface.java

index 0e62f77..054ed53 100644 (file)
@@ -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);
+               }
        }
 
        /**