From 8a78b428b8a8d88717642deab3e7b5b0f5394aa9 Mon Sep 17 00:00:00 2001 From: Maxime Dagnicourt Date: Tue, 26 Feb 2008 09:35:46 +0000 Subject: [PATCH] --- .../controller/AddConferenceController.java | 16 +++++++++++----- .../org/yacos/web/system/session/YACOSUtils.java | 6 +++--- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java b/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java index 690aae5..42a7d50 100644 --- a/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java +++ b/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java @@ -249,10 +249,12 @@ public class AddConferenceController extends AbstractWizardFormController { String action = request.getParameter("action"); if (action == null || action.equals("")) - { - if (! conferenceManager.canCreateConference(SessionService.getInstance().getCurrentUserLogin())) + { + logger.info(this.getClass().toString() + " dans le formBackingObject et dans le if (create new !)"); + if (! conferenceManager.canCreateConference(SessionService.getInstance().getCurrentUserLogin())){ throw new ModelAndViewDefiningException(new ModelAndView("denied")); - + } + criteria = new HashSet(); criteriaAll = new HashSet(); List listCriterion = evaluationManager.getCriterions(); @@ -287,7 +289,9 @@ public class AddConferenceController extends AbstractWizardFormController { pb.setFirstName(user.getFirstName()); pb.setLastName(user.getLastName()); pb.setLogin(user.getLogin()); - listPersonBean.add(pb); + if(SessionService.getInstance().getCurrentUserLogin()== user.getLogin()){ + listPersonBean.add(pb); + } } return conference; @@ -349,7 +353,9 @@ public class AddConferenceController extends AbstractWizardFormController { pb.setFirstName(user.getFirstName()); pb.setLastName(user.getLastName()); pb.setLogin(user.getLogin()); - listPersonBean.add(pb); + if(SessionService.getInstance().getCurrentUserLogin()== user.getLogin()){ + listPersonBean.add(pb); + } } List listUsersForConf = userManager.getUsers(conf.getId(), RoleType.PCMEMBER); diff --git a/YACOSWeb/src/org/yacos/web/system/session/YACOSUtils.java b/YACOSWeb/src/org/yacos/web/system/session/YACOSUtils.java index f3a1ff9..7ec0e9f 100644 --- a/YACOSWeb/src/org/yacos/web/system/session/YACOSUtils.java +++ b/YACOSWeb/src/org/yacos/web/system/session/YACOSUtils.java @@ -1,6 +1,5 @@ package org.yacos.web.system.session; -import java.net.MalformedURLException; import java.net.URL; import javax.servlet.http.HttpServletRequest; @@ -38,8 +37,9 @@ public class YACOSUtils { request.getServerPort(), resource); return url.toString(); - } catch (MalformedURLException e) { - return null; + } catch (Exception e) { + return ""; + } }