Make sure identity is logged out when cancelling profile editing.

The profile edit screen and login profile edit process need to be separated.
zanata · Oct 23, 2013 · 1512db8 · 1512db8
1 parent 20cf804
commit 1512db8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/zanata-war/src/main/java/org/zanata/action/ProfileAction.java b/zanata-war/src/main/java/org/zanata/action/ProfileAction.java
@@ -248,6 +248,8 @@ public String edit() {
 
     public String cancel() {
         if (identityStore.isNewUser(username)) {
+            // Log the identity out
+            identity.logout();
             return "home";
         }
         return "view";

diff --git a/zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml b/zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
@@ -21,7 +21,7 @@
     </s:link>
   </h1>
 
-  <s:fragment rendered="#{identity.loggedIn}">
+  <s:fragment rendered="#{identity.loggedIn and personHome.instance.account.enabled}">
     <a href="#off-canvas--right" id="user_avatar"
       class="off-canvas__toggle--right l--float-right"
       title="#{personHome.instance.account.username}">