From b8e2c923b80880cd48c57cd7b489b43a11bd3018 Mon Sep 17 00:00:00 2001 From: Maxime Dagnicourt Date: Wed, 6 Feb 2008 11:11:01 +0000 Subject: [PATCH] --- .../controller/DispatchArticleController.java | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/YACOSWeb/src/org/yacos/web/chairman/controller/DispatchArticleController.java b/YACOSWeb/src/org/yacos/web/chairman/controller/DispatchArticleController.java index 66e5c98..bd7c26f 100644 --- a/YACOSWeb/src/org/yacos/web/chairman/controller/DispatchArticleController.java +++ b/YACOSWeb/src/org/yacos/web/chairman/controller/DispatchArticleController.java @@ -2,6 +2,7 @@ package org.yacos.web.chairman.controller; import java.util.Collection; import java.util.HashMap; +import java.util.List; import java.util.Map; import javax.servlet.http.HttpServletRequest; @@ -13,13 +14,14 @@ import org.springframework.validation.BindException; import org.springframework.validation.Errors; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.SimpleFormController; +import org.yacos.core.article.Article; import org.yacos.core.article.IArticleManager; import org.yacos.core.conferences.Conference; import org.yacos.core.conferences.IConferenceManager; import org.yacos.core.exceptions.ConferenceDoesntExistException; import org.yacos.core.users.IUserManager; -import org.yacos.core.users.Role.RoleType; import org.yacos.core.users.User; +import org.yacos.core.users.Role.RoleType; import org.yacos.web.PCmember.form.FormDispatcher; import org.yacos.web.system.session.SessionService; @@ -56,12 +58,20 @@ public class DispatchArticleController extends SimpleFormController{ logger.info("Returning dispatcher view"); FormDispatcher fd = new FormDispatcher(); + + Conference conf = SessionService.getInstance().getCurrentConference(); + List members = userManager.getUsers(conf.getId(),RoleType.PCMEMBER); + request.getSession().setAttribute("members", members); + List
listArticles = articleManager.getArticles(conf.getId()); + request.getSession().setAttribute("articles", listArticles); + + HashMap >articlesMembers = new HashMap>(); + for (Article article : listArticles) { + articlesMembers.put(article.getId(),userManager.getPCMemberForArticle(article.getId())); + } + request.getSession().setAttribute("articlesMembers", articlesMembers); + return fd; - - //Conference conf = SessionService.getInstance().getCurrentConference(); - //Collection members = userManager.getUsers(conf.getId(),RoleType.PCMEMBER); - - //request.getSession().setAttribute("members", members); } @SuppressWarnings("unchecked") @@ -81,13 +91,7 @@ public class DispatchArticleController extends SimpleFormController{ @SuppressWarnings("unchecked") protected ModelAndView onSubmit(HttpServletRequest request, HttpServletResponse response, Object command, BindException errors) throws Exception { - /*Conference conf = SessionService.getInstance().getCurrentConference(); - - FormDispatcher fd = (FormDispatcher)command; - Article article = articleManager.getArticle(fd.getIdArticle()); - - return new ModelAndView("dispatchArticle", "articles", articleManager.getArticles(conf.getId()));*/ - + logger.info("Dispatch: In the onSubmit method"); Map model = new HashMap();