diff --git a/YACOSCore/ejbModule/org/yacos/core/conferences/ConferenceManagerBean.java b/YACOSCore/ejbModule/org/yacos/core/conferences/ConferenceManagerBean.java index 7dbcbd6..0515598 100644 --- a/YACOSCore/ejbModule/org/yacos/core/conferences/ConferenceManagerBean.java +++ b/YACOSCore/ejbModule/org/yacos/core/conferences/ConferenceManagerBean.java @@ -46,7 +46,7 @@ public class ConferenceManagerBean implements IConferenceManager { public List getConferences(User user){ List list = new ArrayList(); List tmpList = new UserManagerBean().getRoles(); - System.out.println("allo????????????????????"); + Conference conf; for (Role role : tmpList) { conf = role.getConference(); @@ -76,11 +76,17 @@ public class ConferenceManagerBean implements IConferenceManager { em.merge(role); } + public List getRoles(){ + return em.createQuery("from Role role").getResultList(); + + } + @SuppressWarnings("unchecked") public List getRoles(User user, Conference conf) { Query query = em.createQuery("from Role role where conference = ? and user = ?"); - query.setParameter(0, conf); - query.setParameter(1, user); + query.setParameter(1, conf); + query.setParameter(2, user); + return query.getResultList(); } diff --git a/YACOSCore/ejbModule/org/yacos/core/conferences/IConferenceManager.java b/YACOSCore/ejbModule/org/yacos/core/conferences/IConferenceManager.java index 8ff10b8..54fb03c 100644 --- a/YACOSCore/ejbModule/org/yacos/core/conferences/IConferenceManager.java +++ b/YACOSCore/ejbModule/org/yacos/core/conferences/IConferenceManager.java @@ -29,9 +29,10 @@ public interface IConferenceManager { public List getConferences(User user); - //role methode + //role et user methode public void addRole(Role.RoleType roleType, User user, Conference conf); public void removeRole(Role role); + public List getRoles(); public List getRoles(User user, Conference conf); public void updateRole(Role role); }