CompoPermission ja compoview juttui

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

@@ -13,6 +13,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 
 
 import fi.insomnia.bortal.enums.apps.BillPermission;
 import fi.insomnia.bortal.enums.apps.BillPermission;
+import fi.insomnia.bortal.enums.apps.CompoPermission;
 import fi.insomnia.bortal.enums.apps.ContentPermission;
 import fi.insomnia.bortal.enums.apps.ContentPermission;
 import fi.insomnia.bortal.enums.apps.IAppPermission;
 import fi.insomnia.bortal.enums.apps.IAppPermission;
 import fi.insomnia.bortal.enums.apps.LayoutPermission;
 import fi.insomnia.bortal.enums.apps.LayoutPermission;
@@ -76,6 +77,11 @@ import fi.insomnia.bortal.model.User;
 
 
 		LayoutPermission.S_MANAGE_MENU,
 		LayoutPermission.S_MANAGE_MENU,
 		
 		
+		CompoPermission.S_MANAGE,
+		CompoPermission.S_VOTE,
+		CompoPermission.S_SUBMIT_ENTRY,
+		CompoPermission.S_VIEW_COMPOS,
+
 })
 })
 public class PermissionBean implements PermissionBeanLocal {
 public class PermissionBean implements PermissionBeanLocal {
 
 

code/LanBortalUtilities/src/fi/insomnia/bortal/enums/BortalApplication.java

 package fi.insomnia.bortal.enums;
 package fi.insomnia.bortal.enums;
 
 
 import fi.insomnia.bortal.enums.apps.BillPermission;
 import fi.insomnia.bortal.enums.apps.BillPermission;
+import fi.insomnia.bortal.enums.apps.CompoPermission;
 import fi.insomnia.bortal.enums.apps.ContentPermission;
 import fi.insomnia.bortal.enums.apps.ContentPermission;
 import fi.insomnia.bortal.enums.apps.IAppPermission;
 import fi.insomnia.bortal.enums.apps.IAppPermission;
 import fi.insomnia.bortal.enums.apps.LayoutPermission;
 import fi.insomnia.bortal.enums.apps.LayoutPermission;
@@ -21,6 +22,7 @@ public enum BortalApplication {
 	TERMINAL("Sales and self help terminal roles", TerminalPermission.class),
 	TERMINAL("Sales and self help terminal roles", TerminalPermission.class),
 	LAYOUT("Layoutstuff", LayoutPermission.class),
 	LAYOUT("Layoutstuff", LayoutPermission.class),
 	SALESPOINT("Managing salespoints", SalespointPermission.class),
 	SALESPOINT("Managing salespoints", SalespointPermission.class),
+	COMPO("Managing compos", CompoPermission.class),
 
 
 	;
 	;
 
 

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

+package fi.insomnia.bortal.enums.apps;
+
+import fi.insomnia.bortal.enums.BortalApplication;
+
+public enum CompoPermission implements IAppPermission {
+	
+	MANAGE("Manage compos"),
+	VOTE("Vote"),
+	SUBMIT_ENTRY("Submit entry"),
+	VIEW_COMPOS("View compos"),
+
+	;
+
+	public static final String S_MANAGE = "COMPO/MANAGE";
+	public static final String S_VOTE = "COMPO/VOTE";
+	public static final String S_SUBMIT_ENTRY = "COMPO/SUBMIT_ENTRY";
+	public static final String S_VIEW_COMPOS = "COMPO/VIEW_COMPOS";
+
+	private final String description;
+	private final String fullName;
+
+	private CompoPermission(String desc) {
+		description = desc;
+		fullName = new StringBuilder().append(getParent().toString()).append(DELIMITER).append(toString()).toString();
+
+	}
+
+	@Override
+	public BortalApplication getParent() {
+		return BortalApplication.COMPO;
+	}
+
+	@Override
+	public String getDescription() {
+		return this.description;
+	}
+
+	@Override
+	public String getFullName() {
+		return fullName;
+	}
+
+}

code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/voting/VotingCompoListView.java

@@ -25,6 +25,8 @@ public class VotingCompoListView extends GenericCDIView {
 	@EJB
 	@EJB
 	private VotingBeanLocal votbean;
 	private VotingBeanLocal votbean;
 	
 	
+	boolean curEntries = false;
+	boolean maxParts = false;
 	
 	
 	public List<Compo> getCompos() {
 	public List<Compo> getCompos() {
 		return votbean.getCompoList();
 		return votbean.getCompoList();