This commit is contained in:
Maxime Dagnicourt
2008-02-26 10:06:46 +00:00
parent 108bbc6113
commit d1b3573bbf

View File

@@ -250,15 +250,11 @@ public class AddConferenceController extends AbstractWizardFormController {
String action = request.getParameter("action"); String action = request.getParameter("action");
if (action == null || action.equals("")) if (action == null || action.equals(""))
{ {
logger.info(this.getClass().toString() + " dans le formBackingObject et dans le if (create new !)");
if (! conferenceManager.canCreateConference(SessionService.getInstance().getCurrentUserLogin())) { if (! conferenceManager.canCreateConference(SessionService.getInstance().getCurrentUserLogin())){
throw new ModelAndViewDefiningException(new ModelAndView("denied")); throw new ModelAndViewDefiningException(new ModelAndView("denied"));
} }
SessionService.getInstance().resetCurrentConference();
criteria = new HashSet<CriterionBean>(); criteria = new HashSet<CriterionBean>();
criteriaAll = new HashSet<CriterionBean>(); criteriaAll = new HashSet<CriterionBean>();
List<Criterion> listCriterion = evaluationManager.getCriterions(); List<Criterion> listCriterion = evaluationManager.getCriterions();
@@ -293,7 +289,9 @@ public class AddConferenceController extends AbstractWizardFormController {
pb.setFirstName(user.getFirstName()); pb.setFirstName(user.getFirstName());
pb.setLastName(user.getLastName()); pb.setLastName(user.getLastName());
pb.setLogin(user.getLogin()); pb.setLogin(user.getLogin());
if(SessionService.getInstance().getCurrentUserLogin()== user.getLogin()){
if(!SessionService.getInstance().getCurrentUserLogin().equals(user.getLogin())){
listPersonBean.add(pb); listPersonBean.add(pb);
} }
} }
@@ -357,7 +355,9 @@ public class AddConferenceController extends AbstractWizardFormController {
pb.setFirstName(user.getFirstName()); pb.setFirstName(user.getFirstName());
pb.setLastName(user.getLastName()); pb.setLastName(user.getLastName());
pb.setLogin(user.getLogin()); pb.setLogin(user.getLogin());
if(SessionService.getInstance().getCurrentUserLogin()== user.getLogin()){
if(!SessionService.getInstance().getCurrentUserLogin().equals(user.getLogin())){
listPersonBean.add(pb); listPersonBean.add(pb);
} }
} }