Merge branch 'roleSaveBugFix' into 'master'

Role save bug fix

There was a bug, now there is not a bug

See merge request !291

code/moya-web/WebContent/resources/cditools/user/edit.xhtml

@@ -170,23 +170,20 @@
 	</p:panelGrid>
 	</p:panelGrid>
 
 
 
 
-	<p:panelGrid>
+
 		<h:form id="userSelectableRoles">
 		<h:form id="userSelectableRoles">
 			<p:fieldset legend="#{i18n['user.userSelectableRoles']}" rendered="#{userView.showUserSelectableRoles and cc.attrs.showRoles}">
 			<p:fieldset legend="#{i18n['user.userSelectableRoles']}" rendered="#{userView.showUserSelectableRoles and cc.attrs.showRoles}">
 				<p:panelGrid columns="2" styleClass="noBorders">
 				<p:panelGrid columns="2" styleClass="noBorders">
 					<p:selectManyCheckbox converter="#{roleConverter}" layout="pageDirection" value="#{userView.userSelectableRoles}">
 					<p:selectManyCheckbox converter="#{roleConverter}" layout="pageDirection" value="#{userView.userSelectableRoles}">
 						<f:selectItems value="#{roleDataView.userSelectableRoles}" var="roleitem" itemLabel="#{roleitem.name}" itemValue="#{roleitem}" />
 						<f:selectItems value="#{roleDataView.userSelectableRoles}" var="roleitem" itemLabel="#{roleitem.name}" itemValue="#{roleitem}" />
 					</p:selectManyCheckbox>
 					</p:selectManyCheckbox>
-					<div>
-						<h:message rendered="#{roleView.canReadRoles}" for="roles" />
-					</div>
-
-
 				</p:panelGrid>
 				</p:panelGrid>
-				<p:commandButton action="#{userView.saveUserSelectableRoles}" value="#{i18n['user.saveUserSelectableRoles']}" />
+				<p:commandButton update="userSelectableRoles" actionListener="#{userView.saveUserSelectableRoles}" value="#{i18n['user.saveUserSelectableRoles']}" />
+				<br /><h:outputText rendered="#{userView.saveSuccess}" styleClass="success" value="#{i18n['user.saveSuccessfull']}" />
 			</p:fieldset>
 			</p:fieldset>
 		</h:form>
 		</h:form>
-	</p:panelGrid>
+
+
 
 
 </composite:implementation>
 </composite:implementation>
 </html>
 </html>

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/UserView.java

@@ -602,11 +602,17 @@ public class UserView extends GenericCDIView {
 		this.layoutview = layoutview;
 		this.layoutview = layoutview;
 	}
 	}
 
 
-	public String saveUserSelectableRoles()
+	// we should readlly fix this facesmessages -shit
+	private boolean saveSuccess = false;
+	public boolean isSaveSuccess() {
+		return saveSuccess;
+	}
+	public void saveUserSelectableRoles()
 	{
 	{
 		rolebean.saveUserSelectableRoles(user, userSelectableRoles);
 		rolebean.saveUserSelectableRoles(user, userSelectableRoles);
+		addFaceMessage("user.saveSuccessfull");
 		userSelectableRoles = null;
 		userSelectableRoles = null;
-		return null;
+		saveSuccess = true;
 	}
 	}
 
 
 	public boolean isShowUserSelectableRoles() {
 	public boolean isShowUserSelectableRoles() {

code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n.properties

@@ -491,6 +491,7 @@ user.info         = K\u00E4ytt\u00E4j\u00E4
 user.invite.placeInvite.header = Liit\u00E4 paikka itsellesi
 user.invite.placeInvite.header = Liit\u00E4 paikka itsellesi
 user.meta.box.title = Metadata
 user.meta.box.title = Metadata
 user.roles        = Pakotetut roolit
 user.roles        = Pakotetut roolit
+user.saveSuccessfull=Changes saved successfully
 user.saveUserSelectableRoles = Tallenna
 user.saveUserSelectableRoles = Tallenna
 user.shirt.L      = Unisex L
 user.shirt.L      = Unisex L
 user.shirt.LadyL  = Ladyfit L
 user.shirt.LadyL  = Ladyfit L

code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_fi.properties

@@ -1616,7 +1616,9 @@ user.realname       = Nimi
 user.roles          = Pakotetut roolit
 user.roles          = Pakotetut roolit
 user.rolesave       = Tallenna roolit
 user.rolesave       = Tallenna roolit
 user.save           = Tallenna
 user.save           = Tallenna
+user.saveFailed=
 user.saveRoles      = Tallenna roolit
 user.saveRoles      = Tallenna roolit
+user.saveSuccessfull=Tallennettu onnistuneesti
 user.saveUserSelectableRoles = Tallenna
 user.saveUserSelectableRoles = Tallenna
 user.search         = Hae
 user.search         = Hae
 user.searchUser     = Hae k\u00E4ytt\u00E4j\u00E4\u00E4
 user.searchUser     = Hae k\u00E4ytt\u00E4j\u00E4\u00E4