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

code/LanBortalWeb/WebContent/voting/compolist.xhtml

@@ -9,7 +9,7 @@
 <h:body>
 	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
 		<f:metadata>
-			<!--  <f:event type="preRenderView" listener="#{votingCompoListView.initView}" />  -->
+			  <f:event type="preRenderView" listener="#{votingCompoListView.initView()}" />  
 		</f:metadata>
 		<ui:define name="content">
 			<h:outputStylesheet library="style" name="insomnia2/css/actionlog.css" /> 
@@ -33,14 +33,14 @@
 					</f:facet>
 					<h:outputText value="#{compo.description}" />
 				</h:column>
-				<h:column>
+				<h:column rendered="#{votingCompoListView.curEntries}">
 					<f:facet name="header">
 						<h:outputText value="current entries" />
 					</f:facet>
 					<h:outputText value="#{compo.compoEntries.size()}"  />
 				</h:column>
-				<h:column>
-					<f:facet name="header" >
+				<h:column rendered="#{votingCompoListView.maxParts}">
+					<f:facet name="header">
 						<h:outputText value="Max parts" />
 					</f:facet>
 					<h:outputText value="#{compo.maxParticipantCount}" />

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

@@ -4,12 +4,17 @@ import java.util.List;
 
 import javax.ejb.EJB;
 import javax.enterprise.context.RequestScoped;
+import javax.faces.bean.ManagedBean;
 import javax.inject.Named;
 
+
 import fi.insomnia.bortal.beans.VotingBeanLocal;
 import fi.insomnia.bortal.model.Compo;
+import fi.insomnia.bortal.model.Role;
 import fi.insomnia.bortal.web.cdiview.GenericCDIView;
+import fi.insomnia.bortal.enums.apps.CompoPermission;
 
+@ManagedBean
 @Named
 @RequestScoped
 public class VotingCompoListView extends GenericCDIView {
@@ -18,12 +23,43 @@ public class VotingCompoListView extends GenericCDIView {
 
 	@EJB
 	private VotingBeanLocal votbean;
+	
+	private Role role;
+
+	boolean curEntries;
+	boolean maxParts;
+	
+	public boolean isCurEntries() {
+		return curEntries;
+	}
+
+	public void setCurEntries(boolean curEntries) {
+		this.curEntries = curEntries;
+	}
 
-	boolean curEntries = false;
-	boolean maxParts = false;
+	public boolean isMaxParts() {
+		return maxParts;
+	}
+
+	public void setMaxParts(boolean maxParts) {
+		this.maxParts = maxParts;
+	}
+
+	
 
 	public List<Compo> getCompos() {
 		return votbean.getCompoList();
 	}
+	
+	public void initView() {
+		if(requirePermissions(CompoPermission.VIEW_COMPOS) && role == null) {
+			curEntries = true;
+			maxParts = true;
+		}
+		else {
+			curEntries = false;
+			maxParts = false;
+		}
+	}
 
 }