Actionlogiin roolioikeudet asetettu

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

@@ -3,11 +3,13 @@ package fi.insomnia.bortal.beans;
 import java.util.Date;
 import java.util.List;
 
+import javax.annotation.security.DeclareRoles;
 import javax.annotation.security.RolesAllowed;
 import javax.ejb.EJB;
 import javax.ejb.Stateless;
 
 import fi.insomnia.bortal.enums.ActionLogMessageState;
+import fi.insomnia.bortal.enums.apps.ContentPermission;
 import fi.insomnia.bortal.enums.apps.UserPermission;
 import fi.insomnia.bortal.facade.ActionLogFacade;
 import fi.insomnia.bortal.model.ActionLogMessage;
@@ -22,6 +24,7 @@ import fi.insomnia.bortal.model.Role;
  *  - deletointi
  */
 @Stateless
+@DeclareRoles(ContentPermission.S_MANAGE_ACTIONLOG)
 public class ActionLogBean implements ActionLogBeanLocal {
 	// TODO: Permissions
 	
@@ -38,6 +41,7 @@ public class ActionLogBean implements ActionLogBeanLocal {
         // TODO Auto-generated constructor stub
     }
     
+    @RolesAllowed(ContentPermission.S_MANAGE_ACTIONLOG)
     public void createActionLogEvent(String message, Role crew, boolean isTask) {
     	ActionLogMessage alm = new ActionLogMessage();
     	alm.setCrew(crew);
@@ -53,18 +57,22 @@ public class ActionLogBean implements ActionLogBeanLocal {
     	actionLogFacade.saveToActionLog(alm);
     }
     
+    @RolesAllowed(ContentPermission.S_MANAGE_ACTIONLOG)
     public List<ActionLogMessage> getAllActionLogEvents() {
     	return actionLogFacade.getAllSortedByTimestamp();
     }
     
+    @RolesAllowed(ContentPermission.S_MANAGE_ACTIONLOG)
     public List<Role> getAssignableRoles() {
     	return roleBean.listRoles();
     }
+    @RolesAllowed(ContentPermission.S_MANAGE_ACTIONLOG)
     
     public List<ActionLogMessageResponse> getActionLogMessageResponses(ActionLogMessage alm) {
     	return actionLogFacade.getActionLogMessageResponses(alm);
     }
     
+    @RolesAllowed(ContentPermission.S_MANAGE_ACTIONLOG)
     public void addActionLogMessageResponse(ActionLogMessage alm, String message, ActionLogMessageState state) {
     	if(alm.getState() != state && state != null) {
     		alm.setState(state);
@@ -80,6 +88,7 @@ public class ActionLogBean implements ActionLogBeanLocal {
     }
 
 	@Override
+    @RolesAllowed(ContentPermission.S_MANAGE_ACTIONLOG)
 	public ActionLogMessage find(Integer id) {
 		return actionLogFacade.find(id);
 		

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

@@ -55,6 +55,7 @@ import fi.insomnia.bortal.model.User;
 
 		ContentPermission.S_MANAGE_NEWS,
 		ContentPermission.S_MANAGE_PAGES,
+		ContentPermission.S_MANAGE_ACTIONLOG,
 
 		PollPermission.S_ANSWER,
 		PollPermission.S_VIEW_RESULTS,

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

@@ -5,11 +5,12 @@ import fi.insomnia.bortal.enums.BortalApplication;
 public enum ContentPermission implements IAppPermission {
 	MANAGE_NEWS("Manage newsgroups"),
 	MANAGE_PAGES("Manage pages"),
-
+	MANAGE_ACTIONLOG(""),
 	;
 
 	public static final String S_MANAGE_NEWS = "CONTENT/MANAGE_NEWS";
 	public static final String S_MANAGE_PAGES = "CONTENT/MANAGE_PAGES";
+	public static final String S_MANAGE_ACTIONLOG = "CONTENT/MANAGE_ACTIONLOG";
 
 	private String description;
 	private String fullName;

code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/actionlog/TaskModificationView.java

@@ -10,6 +10,7 @@ import java.util.List;
 
 import fi.insomnia.bortal.beans.ActionLogBeanLocal;
 import fi.insomnia.bortal.enums.ActionLogMessageState;
+import fi.insomnia.bortal.enums.apps.ContentPermission;
 import fi.insomnia.bortal.model.ActionLogMessage;
 import fi.insomnia.bortal.model.ActionLogMessageResponse;
 import fi.insomnia.bortal.web.cdiview.GenericCDIView;
@@ -27,8 +28,8 @@ public class TaskModificationView extends GenericCDIView {
 	private ActionLogBeanLocal logbean;
 	
 	public void initView(){
+		if(super.requirePermissions(ContentPermission.MANAGE_ACTIONLOG) && message == null) {
 			super.beginConversation();
-		if(message == null) {
 			message = logbean.find(id);
 		}
 	}