From cfb2c5ef6582e51ae9cfdfff35e12b5b7fdc24fb Mon Sep 17 00:00:00 2001 From: Jesse Morgan Date: Mon, 24 Mar 2014 21:38:02 -0700 Subject: Enabling the Feed and various bug fixes. * Fixing thread ordering. * Adding a limit of 5 threads per topic. * Changing frontend /account references to UserRecord. --- .../p4square/grow/frontend/TrainingPageResource.java | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (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 0c8f656..ae2f3a7 100644 --- a/src/com/p4square/grow/frontend/TrainingPageResource.java +++ b/src/com/p4square/grow/frontend/TrainingPageResource.java @@ -214,21 +214,8 @@ public class TrainingPageResource extends FreeMarkerPageResource { root.put("videos", videos); root.put("allowUserToSkip", allowUserToSkip); - // Optionally show the feed. - boolean showfeed = "true".equals(getRequest().getCookies().getFirstValue("showfeed")); - if (getQueryValue("showfeed") != null) { - CookieSetting cookie = new CookieSetting("showfeed", "true"); - cookie.setPath("/"); - if ("true".equals(getQueryValue("showfeed"))) { - showfeed = true; - getResponse().getCookieSettings().add(cookie); - } else { - showfeed = false; - cookie.setValue("false"); - cookie.setMaxAge(0); - getResponse().getCookieSettings().add(cookie); - } - } + // Determine if we should show the feed. + boolean showfeed = true; // Don't show the feed if the topic isn't allowed. if (!FeedData.TOPICS.contains(mChapter)) { -- cgit v1.2.3