Merge branch 'release-0.6.4'

[Sone.git] / src / main / java / net / pterodactylus / sone / web / ajax / DismissNotificationAjaxPage.java

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/DismissNotificationAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/DismissNotificationAjaxPage.java
index a098e46..08e3ee5 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/ajax/DismissNotificationAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/DismissNotificationAjaxPage.java
@@ -35,7 +35,7 @@ public class DismissNotificationAjaxPage extends JsonPage {
         *            The Sone web interface
         */
        public DismissNotificationAjaxPage(WebInterface webInterface) {
-               super("ajax/dismissNotification.ajax", webInterface);
+               super("dismissNotification.ajax", webInterface);
        }
 
        /**
@@ -44,15 +44,23 @@ public class DismissNotificationAjaxPage extends JsonPage {
        @Override
        protected JsonObject createJsonObject(Request request) {
                String notificationId = request.getHttpRequest().getParam("notification");
-               Notification notification = webInterface.getCore().getNotifications().getNotification(notificationId);
+               Notification notification = webInterface.getNotifications().getNotification(notificationId);
                if (notification == null) {
                        return createErrorJsonObject("invalid-notification-id");
                }
                if (!notification.isDismissable()) {
                        return createErrorJsonObject("not-dismissable");
                }
-               webInterface.getCore().getNotifications().removeNotification(notification);
+               notification.dismiss();
                return createSuccessJsonObject();
        }
 
+       /**
+        * {@inheritDoc}
+        */
+       @Override
+       protected boolean requiresLogin() {
+               return false;
+       }
+
 }