diff --git a/YACOSWeb/src/org/yacos/web/chairman/controller/DispatchArticleController.java b/YACOSWeb/src/org/yacos/web/chairman/controller/DispatchArticleController.java index e6626f5..ab64e97 100644 --- a/YACOSWeb/src/org/yacos/web/chairman/controller/DispatchArticleController.java +++ b/YACOSWeb/src/org/yacos/web/chairman/controller/DispatchArticleController.java @@ -99,64 +99,19 @@ public class DispatchArticleController implements Controller{ return new ModelAndView("dispatchArticle", model); } - public List addMember(String memberId,int articleId){ - + public List addMember(String memberId,int articleId){ articleManager.assignArticleToPCMember(articleId, memberId); return userManager.getPCMemberForArticle(articleId); } - - - public String sayHello(){ - return "hello"; + + public List removeMember(String memberId,int articleId){ + articleManager.unassignArticleToPCMember(articleId, memberId); + logger.debug("remove article"); + return userManager.getPCMemberForArticle(articleId); } - - /*protected Object formBackingObject(HttpServletRequest request) throws ConferenceDoesntExistException { - 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; + public String sayHello(String name){ + return "hello"+ name; } - - @SuppressWarnings("unchecked") - @Override - protected Map referenceData(HttpServletRequest request, Object command, - Errors errors) throws Exception { - logger.info("Dispatch: In the referenceData method, adding object in the model"); - - Map model = new HashMap(); - Conference conf = SessionService.getInstance().getCurrentConference(); - Collection members = userManager.getUsers(conf.getId(),RoleType.PCMEMBER); - model.put("articles", articleManager.getArticles(conf.getId())); - model.put("members", members); - return model; - } - - @SuppressWarnings("unchecked") - protected ModelAndView onSubmit(HttpServletRequest request, HttpServletResponse response, Object command, BindException errors) throws Exception { - - logger.info("Dispatch: In the onSubmit method"); - - Map model = new HashMap(); - Conference conf = SessionService.getInstance().getCurrentConference(); - Collection members = userManager.getUsers(conf.getId(),RoleType.PCMEMBER); - model.put("articles", articleManager.getArticles(conf.getId())); - model.put("members", members); - return new ModelAndView("dispatchArticle", model); - } -*/ }