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

code/LanBortalWeb/WebContent/WEB-INF/faces-config.xml

@@ -5,7 +5,7 @@
     xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
     http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
     version="2.0"
->
+    >
     <application>
         <resource-bundle>
             <base-name>i18n</base-name>
@@ -24,13 +24,7 @@
 
         </locale-config>
     </application>
-	<navigation-rule>
-		<from-view-id>*</from-view-id>
-		<navigation-case>
-			<from-outcome>permissionDenied</from-outcome>
-			<to-view-id>/permissionDenied.xhtml</to-view-id>
-		</navigation-case>
-	</navigation-rule>
+    
     <navigation-rule>
         <from-view-id>/user/list.xhtml</from-view-id>
         <navigation-case>
@@ -59,7 +53,23 @@
             <to-view-id>/modulePossibleReturnValues.xhtml</to-view-id>
         </navigation-case>
     </navigation-rule>
+    <navigation-rule>
+        <from-view-id>/resources/tools/role/list.xhtml</from-view-id>
+        <navigation-case>
+            <from-outcome>roleEdit</from-outcome>
+            <to-view-id>/modulePossibleReturnValues.xhtml</to-view-id>
+        </navigation-case>
+    </navigation-rule>
+
+    <navigation-rule>
+        <from-view-id>*</from-view-id>
+        <navigation-case>
+            <from-outcome>permissionDenied</from-outcome>
+            <to-view-id>/permissionDenied.xhtml</to-view-id>
+        </navigation-case>
+    </navigation-rule>
 </faces-config>
 
 
 
+

code/LanBortalWeb/WebContent/resources/tools/role/list.xhtml

@@ -11,73 +11,47 @@
     xmlns:tools="http://java.sun.com/jsf/composite/tools">
 
 
-<composite:interface>
-</composite:interface>
+    <composite:interface>
+    </composite:interface>
+
+    <composite:implementation>
 
-<composite:implementation>
 
-	<tools:authorization>
         <h:form>
+            <tools:canRead target="roleManagement">
                 <h:dataTable
                     border="1"
                     id="user"
-			value="#{userView.users}"
-			var="user">
-			<h:column>
-				<f:facet name="header">
-					<h:outputText value="Id" />
-				</f:facet>
-				<h:outputText value="#{user.id}" />
-			</h:column>
-			<h:column>
-				<f:facet name="header">
-					<h:outputText value="Real name" />
-				</f:facet>
-				<h:outputText value="#{user.firstnames}" />
-			</h:column>
-			<h:column>
-				<f:facet name="header">
-					<h:outputText value="Address" />
-				</f:facet>
-				<h:outputText value="#{user.address}" />
-			</h:column>
-			<h:column>
-				<f:facet name="header">
-					<h:outputText value="Town" />
-				</f:facet>
-				<h:outputText value="#{user.town}" />
-			</h:column>
-			<h:column>
-				<f:facet name="header">
-					<h:outputText value="Zip" />
-				</f:facet>
-				<h:outputText value="#{user.zip}" />
-			</h:column>
+                    value="#{roleView.roles}"
+                    var="role">
                     <h:column>
                         <f:facet name="header">
-					<h:outputText value="Phone number" />
+                            <h:outputText value="#" />
                         </f:facet>
-				<h:outputText value="#{user.phone}" />
+                        <h:outputText value="#{role.id}" />
                     </h:column>
                     <h:column>
                         <f:facet name="header">
-					<h:outputText value="Sex" />
+                            <h:outputText value="#{i18n['role.name']}" />
                         </f:facet>
-				<h:outputText value="#{user.female}" />
+                        <h:outputText value="#{role.name}" />
                     </h:column>
+                    <tools:canWrite target="roleManagement">
                         <h:column>
                             <f:facet name="header">
                                 <h:outputText value="Edit" />
                             </f:facet>
                             <h:commandButton
-					action="#{userView.edit()}"
+                                action="#{roleView.edit()}"
                                 value="Edit" />
                         </h:column>
+                    </tools:canWrite>
                 </h:dataTable>
+            </tools:canRead>
         </h:form>
         </tools:authorization>
 
 
-</composite:implementation>
+    </composite:implementation>
 </html>
 

code/LanBortalWeb/src/accessRightTargets

 
 
 userManagement
+roleManagement
\ No newline at end of file

code/LanBortalWeb/src/fi/insomnia/bortal/handler/SessionHandler.java

@@ -69,4 +69,8 @@ public class SessionHandler {
         return user;
     }
 
+    public boolean hasLoggedIn() {
+        throw new UnsupportedOperationException();
+    }
+
 }

code/LanBortalWeb/src/fi/insomnia/bortal/view/RoleView.java

@@ -21,7 +21,7 @@ import org.slf4j.LoggerFactory;
  *
  * @author tuukka
  */
-@ManagedBean(name="RoleView")
+@ManagedBean(name="roleView")
 @SessionScoped
 public class RoleView {
 
@@ -41,6 +41,12 @@ public class RoleView {
     }
 
 
+    public String edit() {
+        role = items.getRowData();
+
+        return "roleEdit";
+    }
+
     /** Creates a new instance of RoleView */
     public RoleView() {
     }