Merge branch 'master' of dev.insomnia.fi:/data/bortal

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/PermissionBean.java

@@ -98,10 +98,13 @@ public class PermissionBean implements PermissionBeanLocal {
 
 
 	@EJB
 	@EJB
 	private UserFacade userfacade;
 	private UserFacade userfacade;
-	
+
 	@EJB
 	@EJB
 	private EventUserFacade eventUserFacade;
 	private EventUserFacade eventUserFacade;
 
 
+	@EJB
+	private EventBeanLocal eventbean;
+
 	//
 	//
 	// @Override
 	// @Override
 	// public boolean hasPermission(String perm) {
 	// public boolean hasPermission(String perm) {
@@ -180,15 +183,17 @@ public class PermissionBean implements PermissionBeanLocal {
 	public EventUser getAnonEventUser() {
 	public EventUser getAnonEventUser() {
 		EventUser defaultUser = eventUserFacade.findByLogin(User.ANONYMOUS_LOGINNAME);
 		EventUser defaultUser = eventUserFacade.findByLogin(User.ANONYMOUS_LOGINNAME);
 		if (defaultUser == null) {
 		if (defaultUser == null) {
-			defaultUser = new EventUser();
+
+			defaultUser = new EventUser(new User(), eventbean.getCurrentEvent());
 			defaultUser.setLogin(User.ANONYMOUS_LOGINNAME);
 			defaultUser.setLogin(User.ANONYMOUS_LOGINNAME);
 			defaultUser.setNick(User.ANONYMOUS_LOGINNAME);
 			defaultUser.setNick(User.ANONYMOUS_LOGINNAME);
-			
+
 			eventUserFacade.create(defaultUser);
 			eventUserFacade.create(defaultUser);
+			eventUserFacade.flush();
 		}
 		}
 		return defaultUser;
 		return defaultUser;
 	}
 	}
-	
+
 	public String getPrincipal() {
 	public String getPrincipal() {
 
 
 		Principal principal = context.getCallerPrincipal();
 		Principal principal = context.getCallerPrincipal();

code/LanBortalDatabase/src/fi/insomnia/bortal/model/OrgRole.java

@@ -51,7 +51,7 @@ public class OrgRole extends GenericEntity {
     @ManyToOne()
     @ManyToOne()
     private EventOrganiser eventOrganizer;
     private EventOrganiser eventOrganizer;
 
 
-    @OneToMany
+    @ManyToMany(mappedBy = "orgRoles")
     private List<Role> eventRoles;
     private List<Role> eventRoles;
 
 
     public OrgRole() {
     public OrgRole() {

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Role.java

@@ -31,7 +31,7 @@ public class Role extends GenericEntity {
     protected static final String NAME_COLUMN = "role_name";
     protected static final String NAME_COLUMN = "role_name";
 
 
     protected static final String EVENT_ID_COLUMN = "event_id";
     protected static final String EVENT_ID_COLUMN = "event_id";
-    
+
     protected static final String ORG_ROLE_ID_COLUMN = "org_role_id";
     protected static final String ORG_ROLE_ID_COLUMN = "org_role_id";
 
 
     public static final Role EMPTY_ROLE = new Role("----");
     public static final Role EMPTY_ROLE = new Role("----");
@@ -76,10 +76,12 @@ public class Role extends GenericEntity {
     @ManyToOne
     @ManyToOne
     @JoinColumn(name = EVENT_ID_COLUMN, nullable = false)
     @JoinColumn(name = EVENT_ID_COLUMN, nullable = false)
     private LanEvent event;
     private LanEvent event;
-    
-    @ManyToOne
-    @JoinColumn(name = ORG_ROLE_ID_COLUMN)
-    private OrgRole orgRole;
+
+    @ManyToMany
+    @JoinTable(name = "roles_provided_by_org_roles",
+            joinColumns = { @JoinColumn(name = "role_id", referencedColumnName = Role.ID_COLUMN) },
+            inverseJoinColumns = { @JoinColumn(name = "org_role_id", referencedColumnName = OrgRole.ID_COLUMN) })
+    private List<OrgRole> orgRoles;
 
 
     public Role() {
     public Role() {
         super();
         super();
@@ -196,12 +198,12 @@ public class Role extends GenericEntity {
         this.users = users;
         this.users = users;
     }
     }
 
 
-    public OrgRole getOrgRole() {
-        return orgRole;
+    public List<OrgRole> getOrgRoles() {
+        return orgRoles;
     }
     }
 
 
-    public void setOrgRole(OrgRole orgRole) {
-        this.orgRole = orgRole;
+    public void setOrgRoles(List<OrgRole> orgRoles) {
+        this.orgRoles = orgRoles;
     }
     }
 
 
 }
 }