From a2a1d7a67b1458cc342c0eb8d5a2732c806ddacf Mon Sep 17 00:00:00 2001 From: Jesse Morgan Date: Thu, 20 Feb 2014 21:14:34 -0800 Subject: Added support for displaying message on Feed. Changed MessageThread so that a thread always contains one original message. Added support in JsonEncodedProvider for JavaTypes in addition to classes. Updated communityfeed.ftl to actually display questions and answers. --- src/com/p4square/grow/frontend/TrainingPageResource.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/com/p4square/grow/frontend/TrainingPageResource.java') diff --git a/src/com/p4square/grow/frontend/TrainingPageResource.java b/src/com/p4square/grow/frontend/TrainingPageResource.java index ef8515a..7b36538 100644 --- a/src/com/p4square/grow/frontend/TrainingPageResource.java +++ b/src/com/p4square/grow/frontend/TrainingPageResource.java @@ -70,6 +70,7 @@ public class TrainingPageResource extends FreeMarkerPageResource { private JsonRequestClient mJsonClient; private Provider mTrainingRecordProvider; + private FeedData mFeedData; // Fields pertaining to this request. protected String mChapter; @@ -95,6 +96,8 @@ public class TrainingPageResource extends FreeMarkerPageResource { } }; + mFeedData = new FeedData(getContext(), mConfig); + mChapter = getAttribute("chapter"); mUserId = getRequest().getClientInfo().getUser().getIdentifier(); } @@ -209,7 +212,12 @@ public class TrainingPageResource extends FreeMarkerPageResource { root.put("overallProgress", overallProgress); root.put("videos", videos); root.put("allowUserToSkip", allowUserToSkip); - root.put("showfeed", getQueryValue("showfeed") != null); + + boolean showfeed = getQueryValue("showfeed") != null; + root.put("showfeed", showfeed); + if (showfeed) { + root.put("feeddata", mFeedData); + } return new TemplateRepresentation(mTrainingTemplate, root, MediaType.TEXT_HTML); -- cgit v1.2.3