kuka on koskenut?

code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/RoleBeanLocal.java

@@ -18,4 +18,6 @@ public interface RoleBeanLocal {
 
 
     public List<Role> listRoles();
     public List<Role> listRoles();
 
 
+    public void mergeChanges(Role role);
+    
 }
 }

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

@@ -39,7 +39,7 @@
                     <tools:canWrite target="roleManagement">
                     <tools:canWrite target="roleManagement">
                         <h:column>
                         <h:column>
                             <f:facet name="header">
                             <f:facet name="header">
-                                <h:outputText value="Edit" />
+                                <h:outputText value="#{i18n['edit']}" />
                             </f:facet>
                             </f:facet>
                             <h:commandButton
                             <h:commandButton
                                 action="#{roleView.edit()}"
                                 action="#{roleView.edit()}"
@@ -49,7 +49,6 @@
                 </h:dataTable>
                 </h:dataTable>
             </tools:canRead>
             </tools:canRead>
         </h:form>
         </h:form>
-        </tools:authorization>
 
 
 
 
     </composite:implementation>
     </composite:implementation>

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

@@ -2,15 +2,16 @@
  * To change this template, choose Tools | Templates
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  * and open the template in the editor.
  */
  */
-
 package fi.insomnia.bortal.view;
 package fi.insomnia.bortal.view;
 
 
 import fi.insomnia.bortal.beans.RoleBeanLocal;
 import fi.insomnia.bortal.beans.RoleBeanLocal;
+import fi.insomnia.bortal.beans.SecurityBeanLocal;
+import fi.insomnia.bortal.exceptions.PermissionDeniedException;
+import fi.insomnia.bortal.handler.SessionHandler;
 import fi.insomnia.bortal.model.Role;
 import fi.insomnia.bortal.model.Role;
-import fi.insomnia.bortal.model.User;
-import java.util.List;
 import javax.ejb.EJB;
 import javax.ejb.EJB;
 import javax.faces.bean.ManagedBean;
 import javax.faces.bean.ManagedBean;
+import javax.faces.bean.ManagedProperty;
 import javax.faces.bean.SessionScoped;
 import javax.faces.bean.SessionScoped;
 import javax.faces.model.DataModel;
 import javax.faces.model.DataModel;
 import javax.faces.model.ListDataModel;
 import javax.faces.model.ListDataModel;
@@ -21,17 +22,21 @@ import org.slf4j.LoggerFactory;
  *
  *
  * @author tuukka
  * @author tuukka
  */
  */
-@ManagedBean(name="roleView")
+@ManagedBean(name = "roleView")
 @SessionScoped
 @SessionScoped
 public class RoleView {
 public class RoleView {
 
 
-    Role role = new Role();
-    DataModel<Role> items;
+    @ManagedProperty("#{sessionHandler}")
+    private SessionHandler sessionhandler;
     
     
     @EJB
     @EJB
     private RoleBeanLocal roleBean;
     private RoleBeanLocal roleBean;
     private static final Logger logger = LoggerFactory.getLogger(RoleView.class);
     private static final Logger logger = LoggerFactory.getLogger(RoleView.class);
 
 
+    @EJB
+    private SecurityBeanLocal securitybean;
+    private Role role = new Role();
+    DataModel<Role> items;
 
 
     public DataModel<Role> getRoles() {
     public DataModel<Role> getRoles() {
         items = new ListDataModel<Role>(roleBean.listRoles());
         items = new ListDataModel<Role>(roleBean.listRoles());
@@ -40,9 +45,20 @@ public class RoleView {
         return items;
         return items;
     }
     }
 
 
+    public String save() {
+
+        if (!sessionhandler.canWrite("roleManagement")) {
+            // Give message to administration what happened here.
+            throw new PermissionDeniedException(securitybean, getSessionhandler().getUser(), "User " + getSessionhandler().getUser() + " does not have permission to modify role!");
+        }
+
+        roleBean.mergeChanges(role);
+
+        return "roleSave";
+    }
 
 
     public String edit() {
     public String edit() {
-        role = items.getRowData();
+        setRole(items.getRowData());
 
 
         return "roleEdit";
         return "roleEdit";
     }
     }
@@ -51,4 +67,31 @@ public class RoleView {
     public RoleView() {
     public RoleView() {
     }
     }
 
 
+    /**
+     * @return the role
+     */
+    public Role getRole() {
+        return role;
+    }
+
+    /**
+     * @param role the role to set
+     */
+    public void setRole(Role role) {
+        this.role = role;
+    }
+
+    /**
+     * @return the sessionhandler
+     */
+    public SessionHandler getSessionhandler() {
+        return sessionhandler;
+    }
+
+    /**
+     * @param sessionhandler the sessionhandler to set
+     */
+    public void setSessionhandler(SessionHandler sessionhandler) {
+        this.sessionhandler = sessionhandler;
+    }
 }
 }

code/LanBortalWeb/src/resources/i18n.properties

@@ -17,3 +17,4 @@ fallbackstr="fallback default"
 teststr=default locale test
 teststr=default locale test
 defaultstr="Something default..."
 defaultstr="Something default..."
 logout=H\u00E4ivy
 logout=H\u00E4ivy
+nasty.user=paha k\u00E4ytt\u00E4j\u00E4 ei yrit\u00E4 haxoroida meid\u00E4n softaa. Kts.

code/LanBortalWeb/src/resources/i18n_en.properties

@@ -17,3 +17,4 @@ fallbackstr="fallback default"
 teststr=default locale test
 teststr=default locale test
 defaultstr="Something default..."
 defaultstr="Something default..."
 logout=H\u00E4ivy
 logout=H\u00E4ivy
+nasty.user=paha k\u00E4ytt\u00E4j\u00E4 ei yrit\u00E4 haxoroida meid\u00E4n softaa. Kts.

code/LanBortalWeb/src/resources/i18n_en_ST.properties

@@ -17,3 +17,4 @@ fallbackstr="fallback default"
 teststr=default locale test
 teststr=default locale test
 defaultstr="Something default..."
 defaultstr="Something default..."
 logout=H\u00E4ivy
 logout=H\u00E4ivy
+nasty.user=paha k\u00E4ytt\u00E4j\u00E4 ei yrit\u00E4 haxoroida meid\u00E4n softaa. Kts.

code/LanBortalWeb/src/resources/i18n_en_ST_v7.properties

@@ -17,3 +17,4 @@ fallbackstr="fallback default"
 teststr=default locale test
 teststr=default locale test
 defaultstr="Something default..."
 defaultstr="Something default..."
 logout=H\u00E4ivy
 logout=H\u00E4ivy
+nasty.user=paha k\u00E4ytt\u00E4j\u00E4 ei yrit\u00E4 haxoroida meid\u00E4n softaa. Kts.

code/LanBortalWeb/src/resources/i18n_fi_IN.properties

@@ -16,3 +16,4 @@ user.validate.notUniqueUsername=i18n K\u00E4ytt\u00E4j\u00E4tunnus on jo olemass
 teststr=brlocale test
 teststr=brlocale test
 fallbackstr=InsomniaSpecific fallback
 fallbackstr=InsomniaSpecific fallback
 logout=H\u00E4ivy
 logout=H\u00E4ivy
+nasty.user=paha k\u00E4ytt\u00E4j\u00E4 ei yrit\u00E4 haxoroida meid\u00E4n softaa. Kts.

code/LanBortalWeb/src/resources/i18n_fi_IN_XII.properties

 teststr=XII locale test
 teststr=XII locale test
 logout=H\u00E4ivy
 logout=H\u00E4ivy
+nasty.user=paha k\u00E4ytt\u00E4j\u00E4 ei yrit\u00E4 haxoroida meid\u00E4n softaa. Kts.