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

Browse Source
This commit is contained in:
Maxime Dagnicourt
2008-02-26 09:35:46 +00:00
parent 2a87bcc352
commit 8a78b428b8
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -250,8 +250,10 @@ 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(""))
{ {
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")); throw new ModelAndViewDefiningException(new ModelAndView("denied"));
}
criteria = new HashSet<CriterionBean>(); criteria = new HashSet<CriterionBean>();
criteriaAll = new HashSet<CriterionBean>(); criteriaAll = new HashSet<CriterionBean>();
@@ -287,8 +289,10 @@ 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()){
listPersonBean.add(pb); listPersonBean.add(pb);
} }
}
return conference; return conference;
} }
@@ -349,8 +353,10 @@ 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()){
listPersonBean.add(pb); listPersonBean.add(pb);
} }
}
List<User> listUsersForConf = userManager.getUsers(conf.getId(), RoleType.PCMEMBER); List<User> listUsersForConf = userManager.getUsers(conf.getId(), RoleType.PCMEMBER);
for (User user : listUsersForConf) { for (User user : listUsersForConf) {

6
YACOSWeb/src/org/yacos/web/system/session/YACOSUtils.java
View File

@@ -1,6 +1,5 @@
package org.yacos.web.system.session; package org.yacos.web.system.session;
import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@@ -38,8 +37,9 @@ public class YACOSUtils {
request.getServerPort(), request.getServerPort(),
resource); resource);
return url.toString(); return url.toString();
} catch (MalformedURLException e) { } catch (Exception e) {
return null; return "";
} }
} }