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

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

@@ -2,6 +2,7 @@ package fi.insomnia.bortal.beans;
 
 
 import java.util.List;
 import java.util.List;
 
 
+import javax.annotation.security.DeclareRoles;
 import javax.ejb.EJB;
 import javax.ejb.EJB;
 import javax.ejb.LocalBean;
 import javax.ejb.LocalBean;
 import javax.ejb.Stateless;
 import javax.ejb.Stateless;
@@ -9,6 +10,7 @@ import javax.ejb.Stateless;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 
 
+import fi.insomnia.bortal.enums.apps.UserPermission;
 import fi.insomnia.bortal.facade.OrgRoleFacade;
 import fi.insomnia.bortal.facade.OrgRoleFacade;
 import fi.insomnia.bortal.model.OrgRole;
 import fi.insomnia.bortal.model.OrgRole;
 
 
@@ -17,6 +19,7 @@ import fi.insomnia.bortal.model.OrgRole;
  */
  */
 @Stateless
 @Stateless
 @LocalBean
 @LocalBean
+@DeclareRoles({ UserPermission.S_READ_ORGROLES, UserPermission.S_WRITE_ORGROLES })
 public class OrgRoleBean implements OrgRoleBeanLocal {
 public class OrgRoleBean implements OrgRoleBeanLocal {
 
 
 	private static final Logger logger = LoggerFactory
 	private static final Logger logger = LoggerFactory

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

@@ -44,6 +44,8 @@ import fi.insomnia.bortal.model.User;
 		UserPermission.S_ANYUSER,
 		UserPermission.S_ANYUSER,
 		UserPermission.S_MANAGE_HTTP_SESSION,
 		UserPermission.S_MANAGE_HTTP_SESSION,
 		UserPermission.S_INVITE_USERS,
 		UserPermission.S_INVITE_USERS,
+		UserPermission.S_READ_ORGROLES,
+		UserPermission.S_WRITE_ORGROLES,
 
 
 		MapPermission.S_VIEW,
 		MapPermission.S_VIEW,
 		MapPermission.S_MANAGE_MAPS,
 		MapPermission.S_MANAGE_MAPS,

code/LanBortalUtilities/src/fi/insomnia/bortal/enums/apps/UserPermission.java

@@ -15,7 +15,10 @@ public enum UserPermission implements IAppPermission {
 	MODIFY_ACCOUNTEVENTS("Modify Account events"),
 	MODIFY_ACCOUNTEVENTS("Modify Account events"),
 	ANYUSER("All users have this anyways"),
 	ANYUSER("All users have this anyways"),
 	MANAGE_HTTP_SESSION("Manage http sessions"),
 	MANAGE_HTTP_SESSION("Manage http sessions"),
-	INVITE_USERS("Invite users"), ;
+	INVITE_USERS("Invite users"),
+	READ_ORGROLES("View organization roles"),
+	WRITE_ORGROLES("Modify organization roles"),
+	;
 
 
 	public static final String S_VIEW_ALL = "USER/VIEW_ALL";
 	public static final String S_VIEW_ALL = "USER/VIEW_ALL";
 	public static final String S_MODIFY = "USER/MODIFY";
 	public static final String S_MODIFY = "USER/MODIFY";
@@ -30,6 +33,8 @@ public enum UserPermission implements IAppPermission {
 	public static final String S_ANYUSER = "USER/ANYUSER";
 	public static final String S_ANYUSER = "USER/ANYUSER";
 	public static final String S_MANAGE_HTTP_SESSION = "USER/MANAGE_HTTP_SESSION";
 	public static final String S_MANAGE_HTTP_SESSION = "USER/MANAGE_HTTP_SESSION";
 	public static final String S_INVITE_USERS = "USER/INVITE_USERS";
 	public static final String S_INVITE_USERS = "USER/INVITE_USERS";
+	public static final String S_READ_ORGROLES = "USER/READ_ORGROLES";
+	public static final String S_WRITE_ORGROLES = "USER/WRITE_ORGROLES";
 
 
 	private String description;
 	private String description;
 	private String fullName;
 	private String fullName;

code/LanBortalWeb/WebContent/orgrole/list.xhtml

@@ -13,7 +13,7 @@
 		<ui:param name="thispage" value="page.orgrole.list" />
 		<ui:param name="thispage" value="page.orgrole.list" />
 		<f:metadata>
 		<f:metadata>
 			<f:event type="preRenderView"
 			<f:event type="preRenderView"
-				listener="#{orgRoleView.permissionRead()}" />
+				listener="#{orgRoleView.permissionList()}" />
 		</f:metadata>
 		</f:metadata>
 		<ui:define name="content">
 		<ui:define name="content">
 			<orgrole:list />
 			<orgrole:list />

code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/user/OrgRoleDataView.java

@@ -29,4 +29,8 @@ public class OrgRoleDataView extends GenericCDIView {
 		return orgRoles;
 		return orgRoles;
 	}
 	}
 	
 	
+	public boolean permissionList() {
+		return true;
+	}
+
 }
 }

code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/user/OrgRoleView.java

+package fi.insomnia.bortal.web.cdiview.user;
+
+import javax.ejb.EJB;
+import javax.enterprise.context.ConversationScoped;
+import javax.inject.Named;
+
+import fi.insomnia.bortal.beans.OrgRoleBeanLocal;
+import fi.insomnia.bortal.enums.apps.UserPermission;
+import fi.insomnia.bortal.web.cdiview.GenericCDIView;
+
+@ConversationScoped
+@Named
+public class OrgRoleView extends GenericCDIView {
+
+	private static final long serialVersionUID = -2492481531713504212L;
+
+	@EJB
+	private OrgRoleBeanLocal orgRoleBean;
+
+	public void permissionList() {
+		requirePermissions(permbean.hasPermission(UserPermission.READ_ORGROLES));
+	}
+
+}