This commit is contained in:
@@ -250,8 +250,10 @@ 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<CriterionBean>();
|
||||
criteriaAll = new HashSet<CriterionBean>();
|
||||
@@ -287,8 +289,10 @@ public class AddConferenceController extends AbstractWizardFormController {
|
||||
pb.setFirstName(user.getFirstName());
|
||||
pb.setLastName(user.getLastName());
|
||||
pb.setLogin(user.getLogin());
|
||||
if(SessionService.getInstance().getCurrentUserLogin()== user.getLogin()){
|
||||
listPersonBean.add(pb);
|
||||
}
|
||||
}
|
||||
|
||||
return conference;
|
||||
}
|
||||
@@ -349,8 +353,10 @@ public class AddConferenceController extends AbstractWizardFormController {
|
||||
pb.setFirstName(user.getFirstName());
|
||||
pb.setLastName(user.getLastName());
|
||||
pb.setLogin(user.getLogin());
|
||||
if(SessionService.getInstance().getCurrentUserLogin()== user.getLogin()){
|
||||
listPersonBean.add(pb);
|
||||
}
|
||||
}
|
||||
|
||||
List<User> listUsersForConf = userManager.getUsers(conf.getId(), RoleType.PCMEMBER);
|
||||
for (User user : listUsersForConf) {
|
||||
|
||||
@@ -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 "";
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user