Add logout button to template. ( was lost in previous loginbox-fix)

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

@@ -149,6 +149,10 @@
 							<h:outputText value="#{i18n['template.loggedInAs']}" />
 							<h:outputText value="#{i18n['template.loggedInAs']}" />
 							<br />
 							<br />
 							<b><h:outputText value="#{sessionHandler.currentUser.nick}" /></b>
 							<b><h:outputText value="#{sessionHandler.currentUser.nick}" /></b>
+							<br />
+							<h:link outcome="/auth/logout">
+								<h:outputText value="#{i18n['login.logout']}" />
+							</h:link>
 						</ui:fragment>
 						</ui:fragment>
 						<ui:fragment rendered="#{!sessionHandler.loggedIn}">
 						<ui:fragment rendered="#{!sessionHandler.loggedIn}">
 							<div style="text-align: left; padding: 0.7em;">
 							<div style="text-align: left; padding: 0.7em;">

code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/user/AuthView.java

@@ -33,7 +33,7 @@ public class AuthView extends GenericCDIView {
 
 
 	@Inject
 	@Inject
 	private NavigationHandler navihandler;
 	private NavigationHandler navihandler;
-	
+
 	@EJB
 	@EJB
 	private transient BootstrapBeanLocal bootStrapBean;
 	private transient BootstrapBeanLocal bootStrapBean;
 
 
@@ -53,13 +53,12 @@ public class AuthView extends GenericCDIView {
 				logger.warn("Error executing logout", e);
 				logger.warn("Error executing logout", e);
 			}
 			}
 		}
 		}
-		
+
 		req.getSession().invalidate();
 		req.getSession().invalidate();
 
 
-		navihandler.forward("/frontpage");
+		navihandler.forward("/frontpage?faces-redirect=true");
 	}
 	}
-	
-	
+
 	public String doLogout() {
 	public String doLogout() {
 		HttpServletRequest req = getRequest();
 		HttpServletRequest req = getRequest();
 		if (permbean.isLoggedIn()) {
 		if (permbean.isLoggedIn()) {
@@ -69,28 +68,28 @@ public class AuthView extends GenericCDIView {
 				logger.warn("Error executing logout", e);
 				logger.warn("Error executing logout", e);
 			}
 			}
 		}
 		}
-		
+
 		req.getSession().invalidate();
 		req.getSession().invalidate();
-		
+
 		navihandler.forward("/frontpage");
 		navihandler.forward("/frontpage");
-		
+
 		return "/frontpage";
 		return "/frontpage";
 	}
 	}
-	
+
 	public void executeLogin() {
 	public void executeLogin() {
 		executeLogin(null);
 		executeLogin(null);
 	}
 	}
-	
+
 	public void executeLogin(String onError) {
 	public void executeLogin(String onError) {
-		if(onError == null)
+		if (onError == null)
 			onError = "/auth/loginError";
 			onError = "/auth/loginError";
 		doLogin(onError);
 		doLogin(onError);
 	}
 	}
 
 
 	private void doLogin(String onError) {
 	private void doLogin(String onError) {
-		
+
 		bootStrapBean.saneDefaults();
 		bootStrapBean.saneDefaults();
-		
+
 		if (login == null || password == null || login.isEmpty() || password.isEmpty()) {
 		if (login == null || password == null || login.isEmpty() || password.isEmpty()) {
 			return;
 			return;
 		}
 		}
@@ -127,15 +126,15 @@ public class AuthView extends GenericCDIView {
 			}
 			}
 
 
 		}
 		}
-		
+
 		return;
 		return;
 	}
 	}
-	
+
 	public void executeAdduserViewLogin() {
 	public void executeAdduserViewLogin() {
 		navihandler.saveNavigation("/admin/adduser/update");
 		navihandler.saveNavigation("/admin/adduser/update");
 		doLogin("/admin/adduser/login");
 		doLogin("/admin/adduser/login");
 	}
 	}
- 	
+
 	public String executeLoginAction() {
 	public String executeLoginAction() {
 		executeLogin();
 		executeLogin();
 		return null;
 		return null;