If no organiser id is provided, use the current events organiser.

Add some functions to orgrolefacade.

code/MoyaBeans/ejbModule/fi/codecrew/moya/facade/OrgRoleFacade.java

@@ -9,10 +9,10 @@ import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Root;
 import javax.persistence.criteria.Root;
 
 
-import fi.codecrew.moya.model.OrgRole_;
 import fi.codecrew.moya.beans.EventBeanLocal;
 import fi.codecrew.moya.beans.EventBeanLocal;
 import fi.codecrew.moya.model.EventOrganiser;
 import fi.codecrew.moya.model.EventOrganiser;
 import fi.codecrew.moya.model.OrgRole;
 import fi.codecrew.moya.model.OrgRole;
+import fi.codecrew.moya.model.OrgRole_;
 import fi.codecrew.moya.model.User;
 import fi.codecrew.moya.model.User;
 
 
 /**
 /**
@@ -29,17 +29,19 @@ public class OrgRoleFacade extends IntegerPkGenericFacade<OrgRole> {
 		super(OrgRole.class);
 		super(OrgRole.class);
 	}
 	}
 
 
-	public List<OrgRole> findForUser(User user) {
+	public List<OrgRole> findForUser(User user, EventOrganiser organisation) {
 		CriteriaBuilder cb = getEm().getCriteriaBuilder();
 		CriteriaBuilder cb = getEm().getCriteriaBuilder();
 		CriteriaQuery<OrgRole> cq = cb.createQuery(OrgRole.class);
 		CriteriaQuery<OrgRole> cq = cb.createQuery(OrgRole.class);
 		Root<OrgRole> root = cq.from(OrgRole.class);
 		Root<OrgRole> root = cq.from(OrgRole.class);
-		cq.where(cb.equal(root.get(OrgRole_.eventOrganisation), eventBean
-				.getCurrentEvent().getOrganiser()), cb.isMember(user,
-				root.get(OrgRole_.users)));
+		cq.where(cb.equal(root.get(OrgRole_.eventOrganisation), organisation), cb.isMember(user, root.get(OrgRole_.users)));
 
 
 		return getEm().createQuery(cq).getResultList();
 		return getEm().createQuery(cq).getResultList();
 	}
 	}
 
 
+	public List<OrgRole> findForUser(User user) {
+		return findForUser(user, eventBean.getCurrentEvent().getOrganiser());
+	}
+
 	public OrgRole createRole(EventOrganiser org, String roleName) {
 	public OrgRole createRole(EventOrganiser org, String roleName) {
 		OrgRole ret = new OrgRole();
 		OrgRole ret = new OrgRole();
 		ret.setEventOrganisation(org);
 		ret.setEventOrganisation(org);

code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/organisation/EventOrgView.java

@@ -82,8 +82,10 @@ public class EventOrgView extends GenericCDIView {
 	}
 	}
 
 
 	public void initEdit() {
 	public void initEdit() {
-
-		if ((super.requirePermissions(eventorgbean.hasOrgPermission(orgId) || user.getUser().isSuperadmin())) && eventorg == null) {
+		if (orgId == null) {
+			orgId = eventbean.getCurrentEvent().getOrganiser().getId();
+		}
+		if (super.requirePermissions(eventorgbean.hasOrgPermission(orgId) || user.getUser().isSuperadmin()) && eventorg == null) {
 			eventorg = eventorgbean.find(orgId);
 			eventorg = eventorgbean.find(orgId);
 			super.beginConversation();
 			super.beginConversation();
 		}
 		}