Merge branch 'master' into 'master'

Kielenvaihtofix

korjaa issuen #18

Reviewed-by: @tuomari

code/MoyaTerminalWeb/src/fi/codecrew/moya/terminal/view/CashierView.java

@@ -10,7 +10,7 @@ public class CashierView extends AbstractView {
 	private static final long serialVersionUID = -4415449134790807417L;
 	private static final long serialVersionUID = -4415449134790807417L;
 
 
 	public void initCreateView() {
 	public void initCreateView() {
-		if (super.requirePermissions(TerminalPermission.CASHIER)) {
+		if (super.requirePermissions(TerminalPermission.INFO)) {
 			super.beginConversation();
 			super.beginConversation();
 		}
 		}
 	}
 	}

code/MoyaTerminalWeb/src/fi/codecrew/moya/terminal/view/CustomerView.java

@@ -10,7 +10,7 @@ public class CustomerView extends AbstractView {
 	private static final long serialVersionUID = -8746462342138568821L;
 	private static final long serialVersionUID = -8746462342138568821L;
 
 
 	public void initCreateView() {
 	public void initCreateView() {
-		if (super.requirePermissions(TerminalPermission.CUSTOMER)) {
+		if (super.requirePermissions(TerminalPermission.USER)) {
 			super.beginConversation();
 			super.beginConversation();
 		}
 		}
 	}
 	}

code/MoyaTerminalWeb/src/fi/codecrew/moya/terminal/view/RedirectView.java

@@ -18,10 +18,10 @@ public class RedirectView {
 	public void redirectByPermissions() throws Exception {
 	public void redirectByPermissions() throws Exception {
 		FacesContext fcont = FacesContext.getCurrentInstance();
 		FacesContext fcont = FacesContext.getCurrentInstance();
 
 
-		if (permissionBean.hasPermission(TerminalPermission.CASHIER)) {
+		if (permissionBean.hasPermission(TerminalPermission.INFO)) {
 			fcont.getApplication().getNavigationHandler()
 			fcont.getApplication().getNavigationHandler()
 					.handleNavigation(fcont, null, "/cashier");
 					.handleNavigation(fcont, null, "/cashier");
-		} else if (permissionBean.hasPermission(TerminalPermission.CUSTOMER)) {
+		} else if (permissionBean.hasPermission(TerminalPermission.USER)) {
 			fcont.getApplication().getNavigationHandler()
 			fcont.getApplication().getNavigationHandler()
 					.handleNavigation(fcont, null, "/customer");
 					.handleNavigation(fcont, null, "/customer");
 		} else {
 		} else {

code/MoyaWeb/WebContent/resources/templates/template1/template.xhtml

@@ -110,8 +110,9 @@
 			<section id="main" class="flex2">
 			<section id="main" class="flex2">
 				<div class="container top">
 				<div class="container top">
 					<h:form id="selectLanguage">
 					<h:form id="selectLanguage">
-						<p:selectOneButton id="langselect" styleClass="languageSelector" value="#{sessionStore.locale}" onchange="this.form.submit()" converter="#{localeConverter}">
+						<p:selectOneButton id="langselect" styleClass="languageSelector" value="#{sessionStore.locale}" immediate="true" converter="#{localeConverter}">
 							<f:selectItems value="#{localeSelectorView.availableLocales}" var="loc" itemValue="#{loc.locale}" itemLabel="#{loc.locale.displayName}" />
 							<f:selectItems value="#{localeSelectorView.availableLocales}" var="loc" itemValue="#{loc.locale}" itemLabel="#{loc.locale.displayName}" />
+							<p:ajax update="@all" event="change" />
 						</p:selectOneButton>
 						</p:selectOneButton>
 					</h:form>
 					</h:form>