Käyttäjänhallinta päivityksiä.

git-svn-id: https://dev.intra.insomnia.fi/svn/trunk@27 8cf89bec-f6a3-4178-919f-364fb3449fe5

code/LanBortalWeb/WebContent/user/edit.xhtml

@@ -12,19 +12,19 @@
 		<ui:define name="header">Edit user</ui:define>
 		<ui:define name="header">Edit user</ui:define>
 		<ui:define name="content">
 		<ui:define name="content">
 		
 		
-			
+		<h:form>
 		<h:dataTable id="user" value="#{userView.user}" var="user">
 		<h:dataTable id="user" value="#{userView.user}" var="user">
 			<h:column>
 			<h:column>
 				<f:facet name="header">
 				<f:facet name="header">
 					<h:outputText value="Nick" />
 					<h:outputText value="Nick" />
 				</f:facet>
 				</f:facet>
-				<h:inputText value="{#user.nick}" />
+				<h:inputText value="#{user.nick}" />
 			</h:column>
 			</h:column>
 			<h:column>
 			<h:column>
 				<f:facet name="header">
 				<f:facet name="header">
 					<h:outputText value="Real name" />
 					<h:outputText value="Real name" />
 				</f:facet>
 				</f:facet>
-				<h:inputText value="{#user.realname}" />
+				<h:inputText value="#{user.name}" />
 			</h:column>
 			</h:column>
 			<h:column>
 			<h:column>
 				<f:facet name="header">
 				<f:facet name="header">
@@ -36,9 +36,11 @@
 				<f:facet name="header">
 				<f:facet name="header">
 					<h:outputText value="Town" />
 					<h:outputText value="Town" />
 				</f:facet>
 				</f:facet>
-				<h:inputText value="{#user.town}" />
+				<h:inputText value="#{user.town}" />
 			</h:column>
 			</h:column>
 		</h:dataTable>
 		</h:dataTable>
+		<h:commandButton action="#{userView.saveEdited()}" value="Save" />
+		</h:form>
 		
 		
 		</ui:define>
 		</ui:define>
 		<ui:define name="footer">footer</ui:define>
 		<ui:define name="footer">footer</ui:define>

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

@@ -34,7 +34,7 @@ public class UserView {
     private User currentUser;
     private User currentUser;
     private String nick = "default";
     private String nick = "default";
     private String password = "default";
     private String password = "default";
-    private String realname = "default";
+    private String name = "default";
     private String email = "default";
     private String email = "default";
     private String address = "default";
     private String address = "default";
     private String town = "default";
     private String town = "default";
@@ -106,7 +106,7 @@ public class UserView {
 	    return "fault";
 	    return "fault";
 	}
 	}
 	// asetetaan muut kentt..
 	// asetetaan muut kentt..
-	currentUser.setName(realname);
+	currentUser.setName(name);
 	currentUser.setAddress(address);
 	currentUser.setAddress(address);
 	currentUser.setNick(nick);
 	currentUser.setNick(nick);
 	currentUser.setZip(zip);
 	currentUser.setZip(zip);
@@ -120,6 +120,20 @@ public class UserView {
 	
 	
 	return "list";
 	return "list";
     }
     }
+    
+    public String saveEdited() {
+   	this.item.setName(name);
+   	this.item.setAddress(address);
+   	this.item.setNick(nick);
+   	this.item.setZip(zip);
+    this.item.setEmail(email);
+   	this.item.setTown(town);
+   	this.item.setPhone(phone);
+   	this.item.setFemale(female);
+   	this.item.setPassword(password);
+    userBean.mergeChanges(this.item);
+    return "list";
+    }
 
 
     public void setNick(String nick) {
     public void setNick(String nick) {
 	this.nick = nick;
 	this.nick = nick;
@@ -134,11 +148,11 @@ public class UserView {
     }
     }
 
 
     public String getRealname() {
     public String getRealname() {
-	return realname;
+	return name;
     }
     }
 
 
     public void setRealname(String realname) {
     public void setRealname(String realname) {
-	this.realname = realname;
+	this.name = realname;
     }
     }
 
 
     public void setCurrentUser(User currentUser) {
     public void setCurrentUser(User currentUser) {