diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/addConference5.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/addConference5.jsp index 6099bd2..f3a2102 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/addConference5.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference5.jsp @@ -78,7 +78,8 @@ function fillTable2() { function addPerson(eleid) { var person = peopleCache[eleid.substring(6)]; dwr.engine.beginBatch(); - AddCriteriaJS.setPerson(person); + AddCriteriaJS.setPerson(person); + filterUser(null, dwr.util.getValue("myfilter")); fillTable(); fillTable2(); dwr.engine.endBatch(); diff --git a/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java b/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java index df4f397..4b917d6 100644 --- a/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java +++ b/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java @@ -176,28 +176,26 @@ public class AddConferenceController extends AbstractWizardFormController { } conferenceSession.setCriteriaAll(criteriaAll); - conferenceSession.setListPersonBean(new ArrayList()); conferenceSession.setListPersonAdded(new ArrayList()); conferenceSession.setListInvitations(new ArrayList()); - conferenceSession.setListPersonFiltered(conferenceSession.getUsersFiltered()); - List listPersonBean = conferenceSession.getUsers(); + + List listPersonBean = new ArrayList(); List listUsers = userManager.getUsers(); for (User user : listUsers) { - PersonBean pb = new PersonBean(); - conferenceSession.setNextPerson2(conferenceSession.getNextPerson2() + 1); - pb.setId(conferenceSession.getNextPerson2()); - pb.setFirstName(user.getFirstName()); - pb.setLastName(user.getLastName()); - pb.setLogin(user.getLogin()); - if(!SessionService.getInstance().getCurrentUserLogin().equals(user.getLogin())){ - + PersonBean pb = new PersonBean(); + conferenceSession.setNextPerson2(conferenceSession.getNextPerson2() + 1); + pb.setId(conferenceSession.getNextPerson2()); + pb.setFirstName(user.getFirstName()); + pb.setLastName(user.getLastName()); + pb.setLogin(user.getLogin()); listPersonBean.add(pb); } } conferenceSession.setListPersonBean(listPersonBean); + conferenceSession.setListPersonFiltered(listPersonBean); return conference; } @@ -257,22 +255,19 @@ public class AddConferenceController extends AbstractWizardFormController { } conferenceSession.setCriteriaAll(criteriaAll); - conferenceSession.setListPersonBean(new ArrayList()); - conferenceSession.setListPersonAdded(new ArrayList()); conferenceSession.setListInvitations(new ArrayList()); - conferenceSession.setListPersonFiltered(conferenceSession.getUsersFiltered()); + List listUsers = userManager.getUsers(); - List listPersonBean = conferenceSession.getUsers(); + List listPersonBean = new ArrayList(); for (User user : listUsers) { - PersonBean pb = new PersonBean(); - conferenceSession.setNextPerson2(conferenceSession.getNextPerson2() + 1); - pb.setId(conferenceSession.getNextPerson2()); - pb.setFirstName(user.getFirstName()); - pb.setLastName(user.getLastName()); - pb.setLogin(user.getLogin()); - if(! SessionService.getInstance().getCurrentUserLogin().equals(user.getLogin())){ + PersonBean pb = new PersonBean(); + conferenceSession.setNextPerson2(conferenceSession.getNextPerson2() + 1); + pb.setId(conferenceSession.getNextPerson2()); + pb.setFirstName(user.getFirstName()); + pb.setLastName(user.getLastName()); + pb.setLogin(user.getLogin()); listPersonBean.add(pb); } } @@ -280,13 +275,15 @@ public class AddConferenceController extends AbstractWizardFormController { List listUsersForConf = userManager.getUsers(conf.getId(), RoleType.PCMEMBER); List listPersonAddedTmp = new ArrayList(); for (User user : listUsersForConf) { - PersonBean pb = new PersonBean(); - conferenceSession.setNextPerson2(conferenceSession.getNextPerson2() + 1); - pb.setId(conferenceSession.getNextPerson2()); - pb.setFirstName(user.getFirstName()); - pb.setLastName(user.getLastName()); - pb.setLogin(user.getLogin()); - listPersonAddedTmp.add(pb); + if(! SessionService.getInstance().getCurrentUserLogin().equals(user.getLogin())){ + PersonBean pb = new PersonBean(); + conferenceSession.setNextPerson2(conferenceSession.getNextPerson2() + 1); + pb.setId(conferenceSession.getNextPerson2()); + pb.setFirstName(user.getFirstName()); + pb.setLastName(user.getLastName()); + pb.setLogin(user.getLogin()); + listPersonAddedTmp.add(pb); + } } // remove of the person already added @@ -296,8 +293,10 @@ public class AddConferenceController extends AbstractWizardFormController { if (person.getLogin().equals(person2.getLogin())) listPersonBean.remove(person); } - conferenceSession.setListPersonBean(listPersonBean); + conferenceSession.setListPersonAdded(listPersonAddedTmp); + conferenceSession.setListPersonBean(listPersonBean); + conferenceSession.setListPersonFiltered(listPersonBean); DateFormat format = new SimpleDateFormat("yyyy-MM-dd");