projects
/
Sone.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
f9bc38e
)
Get the notifications from the web interface.
author
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Sun, 14 Nov 2010 16:11:29 +0000
(17:11 +0100)
committer
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Sun, 14 Nov 2010 16:11:29 +0000
(17:11 +0100)
src/main/java/net/pterodactylus/sone/web/DismissNotificationPage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/ajax/DismissNotificationAjaxPage.java
patch
|
blob
|
history
src/main/resources/templates/include/head.html
patch
|
blob
|
history
diff --git
a/src/main/java/net/pterodactylus/sone/web/DismissNotificationPage.java
b/src/main/java/net/pterodactylus/sone/web/DismissNotificationPage.java
index
bdbf008
..
4981afb
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/DismissNotificationPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/DismissNotificationPage.java
@@
-50,9
+50,9
@@
public class DismissNotificationPage extends SoneTemplatePage {
protected void processTemplate(Request request, Template template) throws RedirectException {
super.processTemplate(request, template);
String notificationId = request.getHttpRequest().getPartAsStringFailsafe("notification", 36);
protected void processTemplate(Request request, Template template) throws RedirectException {
super.processTemplate(request, template);
String notificationId = request.getHttpRequest().getPartAsStringFailsafe("notification", 36);
- Notification notification = webInterface.get
Core().get
Notifications().getNotification(notificationId);
+ Notification notification = webInterface.getNotifications().getNotification(notificationId);
if ((notification != null) && notification.isDismissable()) {
if ((notification != null) && notification.isDismissable()) {
-
webInterface.getCore().getNotifications().removeNotification(notification
);
+
notification.dismiss(
);
}
String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 64);
throw new RedirectException(returnPage);
}
String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 64);
throw new RedirectException(returnPage);
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
..
44171e3
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/ajax/DismissNotificationAjaxPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/ajax/DismissNotificationAjaxPage.java
@@
-44,14
+44,14
@@
public class DismissNotificationAjaxPage extends JsonPage {
@Override
protected JsonObject createJsonObject(Request request) {
String notificationId = request.getHttpRequest().getParam("notification");
@Override
protected JsonObject createJsonObject(Request request) {
String notificationId = request.getHttpRequest().getParam("notification");
- Notification notification = webInterface.get
Core().get
Notifications().getNotification(notificationId);
+ Notification notification = webInterface.getNotifications().getNotification(notificationId);
if (notification == null) {
return createErrorJsonObject("invalid-notification-id");
}
if (!notification.isDismissable()) {
return createErrorJsonObject("not-dismissable");
}
if (notification == null) {
return createErrorJsonObject("invalid-notification-id");
}
if (!notification.isDismissable()) {
return createErrorJsonObject("not-dismissable");
}
-
webInterface.getCore().getNotifications().removeNotification(notification
);
+
notification.dismiss(
);
return createSuccessJsonObject();
}
return createSuccessJsonObject();
}
diff --git
a/src/main/resources/templates/include/head.html
b/src/main/resources/templates/include/head.html
index
75485bf
..
2802d4e
100644
(file)
--- a/
src/main/resources/templates/include/head.html
+++ b/
src/main/resources/templates/include/head.html
@@
-214,7
+214,7
@@
<%/if>
<div id="notification-area">
<%/if>
<div id="notification-area">
- <%foreach webInterface.
core.
notifications.all notification>
+ <%foreach webInterface.notifications.all notification>
<div class="notification" id="<% notification.id|html>">
<%if notification.dismissable>
<form class="dismiss" action="dismissNotification.html" method="post">
<div class="notification" id="<% notification.id|html>">
<%if notification.dismissable>
<form class="dismiss" action="dismissNotification.html" method="post">