Fix orgrole creation

code/moya-beans/ejbModule/fi/codecrew/moya/beans/MenuBean.java

@@ -232,6 +232,7 @@ public class MenuBean implements MenuBeanLocal {
 		adminroles.addPage(menuitemfacade.findOrCreate("/role/edit"), null).setVisible(false);
 		adminroles.addPage(menuitemfacade.findOrCreate("/orgrole/list"), UserPermission.READ_ORGROLES);
 		adminroles.addPage(menuitemfacade.findOrCreate("/orgrole/create"), UserPermission.WRITE_ORGROLES);
+		adminroles.addPage(menuitemfacade.findOrCreate("/orgrole/edit"), null).setVisible(false);
 
 		MenuNavigation adminEventCards = adminuser.addPage(null, null);
 		adminEventCards.setKey("subnavi.cards");

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/OrgRoleView.java

@@ -82,16 +82,16 @@ public class OrgRoleView extends GenericCDIView {
 	}
 
 	public void initForCreate() {
-		if (requirePermissions(permbean.hasPermission(UserPermission.WRITE_ORGROLES))) {
+		if (requirePermissions(permbean.hasPermission(UserPermission.WRITE_ORGROLES)) && orgRole == null) {
 			OrgRole role = new OrgRole();
 			role.setEventOrganisation(eventBean.getCurrentEvent().getOrganiser());
-			setOrgRole(role);
+			orgRole = role;
 			super.beginConversation();
 		}
 	}
 
 	public void initForEdit() {
-		if (requirePermissions(permbean.hasPermission(UserPermission.WRITE_ORGROLES))) {
+		if (requirePermissions(permbean.hasPermission(UserPermission.WRITE_ORGROLES)) && orgRole == null) {
 			orgRole = orgRoleBean.find(id);
 			super.beginConversation();
 		}