projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'select-sender-identity' into next
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
web
/
ajax
/
GetPostAjaxPage.java
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
764c5bf
..
a0aa6e2
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/ajax/GetPostAjaxPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/ajax/GetPostAjaxPage.java
@@
-20,9
+20,11
@@
package net.pterodactylus.sone.web.ajax;
import java.io.StringWriter;
import net.pterodactylus.sone.data.Post;
import java.io.StringWriter;
import net.pterodactylus.sone.data.Post;
+import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.web.WebInterface;
import net.pterodactylus.util.io.Closer;
import net.pterodactylus.util.json.JsonObject;
import net.pterodactylus.sone.web.WebInterface;
import net.pterodactylus.util.io.Closer;
import net.pterodactylus.util.json.JsonObject;
+import net.pterodactylus.util.template.DataProvider;
import net.pterodactylus.util.template.Template;
import net.pterodactylus.util.template.TemplateException;
import net.pterodactylus.util.template.Template;
import net.pterodactylus.util.template.TemplateException;
@@
-60,8
+62,7
@@
public class GetPostAjaxPage extends JsonPage {
if (post == null) {
return createErrorJsonObject("invalid-post-id");
}
if (post == null) {
return createErrorJsonObject("invalid-post-id");
}
- postTemplate.set("currentSone", getCurrentSone(request.getToadletContext()));
- return createSuccessJsonObject().put("post", createJsonPost(post));
+ return createSuccessJsonObject().put("post", createJsonPost(post, getCurrentSone(request.getToadletContext())));
}
/**
}
/**
@@
-82,17
+83,22
@@
public class GetPostAjaxPage extends JsonPage {
*
* @param post
* The post to create a JSON object from
*
* @param post
* The post to create a JSON object from
+ * @param currentSone
+ * The currently logged in Sone (to store in the template)
* @return The JSON representation of the post
*/
* @return The JSON representation of the post
*/
- private JsonObject createJsonPost(Post post) {
+ private JsonObject createJsonPost(Post post
, Sone currentSone
) {
JsonObject jsonPost = new JsonObject();
jsonPost.put("id", post.getId());
jsonPost.put("sone", post.getSone().getId());
JsonObject jsonPost = new JsonObject();
jsonPost.put("id", post.getId());
jsonPost.put("sone", post.getSone().getId());
+ jsonPost.put("recipient", (post.getRecipient() == null) ? null : post.getRecipient().getId());
jsonPost.put("time", post.getTime());
jsonPost.put("time", post.getTime());
- postTemplate.set("post", post);
StringWriter stringWriter = new StringWriter();
StringWriter stringWriter = new StringWriter();
+ DataProvider dataProvider = postTemplate.createDataProvider();
+ dataProvider.set("post", post);
+ dataProvider.set("currentSone", currentSone);
try {
try {
- postTemplate.render(stringWriter);
+ postTemplate.render(
dataProvider,
stringWriter);
} catch (TemplateException te1) {
/* TODO - shouldn’t happen. */
} finally {
} catch (TemplateException te1) {
/* TODO - shouldn’t happen. */
} finally {