christiancorsano/yacos
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correction du bug avec la session

Browse Source
This commit is contained in:
Frederic Debuire
2008-03-10 22:59:51 +00:00
parent fa862c014d
commit 058ae60d40
2 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
YACOSWeb/WebContent/WEB-INF/jsp/addConference5.jsp
View File

@@ -79,6 +79,7 @@ function addPerson(eleid) {
var person = peopleCache[eleid.substring(6)];
dwr.engine.beginBatch();
AddCriteriaJS.setPerson(person);
filterUser(null, dwr.util.getValue("myfilter"));
fillTable();
fillTable2();
dwr.engine.endBatch();

25
YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java
View File

@@ -176,28 +176,26 @@ public class AddConferenceController extends AbstractWizardFormController {
}
conferenceSession.setCriteriaAll(criteriaAll);
conferenceSession.setListPersonBean(new ArrayList<PersonBean>());
conferenceSession.setListPersonAdded(new ArrayList<PersonBean>());
conferenceSession.setListInvitations(new ArrayList<String>());
conferenceSession.setListPersonFiltered(conferenceSession.getUsersFiltered());
List<PersonBean> listPersonBean = conferenceSession.getUsers();
List<PersonBean> listPersonBean = new ArrayList<PersonBean>();
List<User> listUsers = userManager.getUsers();
for (User user : listUsers) {
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());
if(!SessionService.getInstance().getCurrentUserLogin().equals(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<PersonBean>());
conferenceSession.setListPersonAdded(new ArrayList<PersonBean>());
conferenceSession.setListInvitations(new ArrayList<String>());
conferenceSession.setListPersonFiltered(conferenceSession.getUsersFiltered());
List<User> listUsers = userManager.getUsers();
List<PersonBean> listPersonBean = conferenceSession.getUsers();
List<PersonBean> listPersonBean = new ArrayList<PersonBean>();
for (User user : listUsers) {
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());
if(! SessionService.getInstance().getCurrentUserLogin().equals(user.getLogin())){
listPersonBean.add(pb);
}
}
@@ -280,6 +275,7 @@ public class AddConferenceController extends AbstractWizardFormController {
List<User> listUsersForConf = userManager.getUsers(conf.getId(), RoleType.PCMEMBER);
List<PersonBean> listPersonAddedTmp = new ArrayList<PersonBean>();
for (User user : listUsersForConf) {
if(! SessionService.getInstance().getCurrentUserLogin().equals(user.getLogin())){
PersonBean pb = new PersonBean();
conferenceSession.setNextPerson2(conferenceSession.getNextPerson2() + 1);
pb.setId(conferenceSession.getNextPerson2());
@@ -288,6 +284,7 @@ public class AddConferenceController extends AbstractWizardFormController {
pb.setLogin(user.getLogin());
listPersonAddedTmp.add(pb);
}
}
// remove of the person already added
List<PersonBean> listPersonIter = new ArrayList<PersonBean>(listPersonBean);
@@ -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");