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:
e055fef
)
Store the core in all template contexts.
author
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Tue, 21 Jun 2011 10:21:41 +0000
(12:21 +0200)
committer
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Tue, 21 Jun 2011 10:21:41 +0000
(12:21 +0200)
src/main/java/net/pterodactylus/sone/core/SoneInserter.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/ajax/GetNotificationAjaxPage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/ajax/GetPostAjaxPage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/ajax/GetReplyAjaxPage.java
patch
|
blob
|
history
diff --git
a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
index
cc5f689
..
aa2062c
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/core/SoneInserter.java
+++ b/
src/main/java/net/pterodactylus/sone/core/SoneInserter.java
@@
-347,6
+347,7
@@
public class SoneInserter extends AbstractService {
}
TemplateContext templateContext = templateContextFactory.createTemplateContext();
}
TemplateContext templateContext = templateContextFactory.createTemplateContext();
+ templateContext.set("core", core);
templateContext.set("currentSone", soneProperties);
templateContext.set("currentEdition", core.getUpdateChecker().getLatestEdition());
templateContext.set("version", SonePlugin.VERSION);
templateContext.set("currentSone", soneProperties);
templateContext.set("currentEdition", core.getUpdateChecker().getLatestEdition());
templateContext.set("version", SonePlugin.VERSION);
diff --git
a/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
b/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
index
a0174a9
..
b7e36f4
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
@@
-250,6
+250,7
@@
public class SoneTemplatePage extends FreenetTemplatePage {
protected void processTemplate(Request request, TemplateContext templateContext) throws RedirectException {
super.processTemplate(request, templateContext);
Sone currentSone = getCurrentSone(request.getToadletContext(), false);
protected void processTemplate(Request request, TemplateContext templateContext) throws RedirectException {
super.processTemplate(request, templateContext);
Sone currentSone = getCurrentSone(request.getToadletContext(), false);
+ templateContext.set("core", webInterface.getCore());
templateContext.set("currentSone", currentSone);
templateContext.set("localSones", webInterface.getCore().getLocalSones());
templateContext.set("request", request);
templateContext.set("currentSone", currentSone);
templateContext.set("localSones", webInterface.getCore().getLocalSones());
templateContext.set("request", request);
diff --git
a/src/main/java/net/pterodactylus/sone/web/ajax/GetNotificationAjaxPage.java
b/src/main/java/net/pterodactylus/sone/web/ajax/GetNotificationAjaxPage.java
index
1406c3a
..
03cecee
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/ajax/GetNotificationAjaxPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/ajax/GetNotificationAjaxPage.java
@@
-115,6
+115,7
@@
public class GetNotificationAjaxPage extends JsonPage {
try {
if (notification instanceof TemplateNotification) {
TemplateContext templateContext = webInterface.getTemplateContextFactory().createTemplateContext().mergeContext(((TemplateNotification) notification).getTemplateContext());
try {
if (notification instanceof TemplateNotification) {
TemplateContext templateContext = webInterface.getTemplateContextFactory().createTemplateContext().mergeContext(((TemplateNotification) notification).getTemplateContext());
+ templateContext.set("core", webInterface.getCore());
templateContext.set("currentSone", webInterface.getCurrentSone(request.getToadletContext(), false));
templateContext.set("localSones", webInterface.getCore().getLocalSones());
templateContext.set("request", request);
templateContext.set("currentSone", webInterface.getCurrentSone(request.getToadletContext(), false));
templateContext.set("localSones", webInterface.getCore().getLocalSones());
templateContext.set("request", request);
diff --git
a/src/main/java/net/pterodactylus/sone/web/ajax/GetPostAjaxPage.java
b/src/main/java/net/pterodactylus/sone/web/ajax/GetPostAjaxPage.java
index
f46ec6b
..
f56c5b7
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/ajax/GetPostAjaxPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/ajax/GetPostAjaxPage.java
@@
-97,6
+97,7
@@
public class GetPostAjaxPage extends JsonPage {
jsonPost.put("time", post.getTime());
StringWriter stringWriter = new StringWriter();
TemplateContext templateContext = webInterface.getTemplateContextFactory().createTemplateContext();
jsonPost.put("time", post.getTime());
StringWriter stringWriter = new StringWriter();
TemplateContext templateContext = webInterface.getTemplateContextFactory().createTemplateContext();
+ templateContext.set("core", webInterface.getCore());
templateContext.set("request", request);
templateContext.set("post", post);
templateContext.set("currentSone", currentSone);
templateContext.set("request", request);
templateContext.set("post", post);
templateContext.set("currentSone", currentSone);
diff --git
a/src/main/java/net/pterodactylus/sone/web/ajax/GetReplyAjaxPage.java
b/src/main/java/net/pterodactylus/sone/web/ajax/GetReplyAjaxPage.java
index
24bbbe2
..
6cc7d47
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/ajax/GetReplyAjaxPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/ajax/GetReplyAjaxPage.java
@@
-99,6
+99,7
@@
public class GetReplyAjaxPage extends JsonPage {
jsonReply.put("time", reply.getTime());
StringWriter stringWriter = new StringWriter();
TemplateContext templateContext = webInterface.getTemplateContextFactory().createTemplateContext();
jsonReply.put("time", reply.getTime());
StringWriter stringWriter = new StringWriter();
TemplateContext templateContext = webInterface.getTemplateContextFactory().createTemplateContext();
+ templateContext.set("core", webInterface.getCore());
templateContext.set("request", request);
templateContext.set("reply", reply);
templateContext.set("currentSone", currentSone);
templateContext.set("request", request);
templateContext.set("reply", reply);
templateContext.set("currentSone", currentSone);