From 397abc4220b331c4771a7f8f6cd6f109cde88897 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Mon, 20 Apr 2020 19:09:46 +0000
Subject: [PATCH]

---
 ayanova/devdocs/todo.txt      | 13 ++++++-------
 ayanova/src/api/gzmenu.js     | 12 ------------
 ayanova/src/api/initialize.js | 10 ++++++++++
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index 8de72358..2556312b 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -65,9 +65,11 @@ CURRENT TODOs
 @@@@@@@@@@@ ROADMAP STAGE 2:
 
 
-
-todo: enter new tag in widget doesn't trigger dirty?
-
+todo: Not sure I like not being able to logout from a widget edit form
+	- put back?
+	- Put in nav menu to left (seems logical that way) and remove from any other menu
+		- as bottom option
+		
 todo: Test widget form as bizamdinlimited read only mode because I think several things are not right in read only mode
 	- remove clear button and option if read only
 	- make sure can't use any of the controls the make changes
@@ -78,10 +80,7 @@ todo: bug regression, customize form shows dirty immediately after good save?
 
 todo: BUG Something fucked with history?  When I click on a widget's history button in admin user history view it shows two created record with differing timestamps
 	- note, it doesn't seem to do it on the most recent widgets, but only on the first few created for some reason?!
-todo: Not sure I like not being able to logout from a widget edit form
-	- put back?
-	- Put in nav menu to left (seems logical that way) and remove from any other menu
-		- as bottom option
+
 todo: would like to see who I'm logged in as at all times
 	- In menu instead of "Home" text?
 	- In status bar at bottom?
diff --git a/ayanova/src/api/gzmenu.js b/ayanova/src/api/gzmenu.js
index c72c9db7..8af3acb7 100644
--- a/ayanova/src/api/gzmenu.js
+++ b/ayanova/src/api/gzmenu.js
@@ -165,15 +165,6 @@ export default {
         data: "ay-about"
       });
     }
-
-    //LOGOUT
-    if (!isCoreBizObject) {
-      vm.appBar.menuItems.push({
-        title: window.$gz.translation.get("Logout"),
-        icon: "fa-sign-out-alt",
-        key: "app:logout"
-      });
-    }
   },
   ///////////////////////////////
   // CHANGE HANDLER
@@ -266,9 +257,6 @@ export default {
             params: { ayatype: item.data.ayaType, recordid: item.data.recordId }
           });
           break;
-        case "logout":
-          vm.$router.push("/login");
-          break;
         case "customize":
           vm.$router.push({
             name: "ay-customize",
diff --git a/ayanova/src/api/initialize.js b/ayanova/src/api/initialize.js
index 158ed3bb..a6ca8a45 100644
--- a/ayanova/src/api/initialize.js
+++ b/ayanova/src/api/initialize.js
@@ -737,6 +737,16 @@ export default function initialize() {
               "homecustomer"
             );
           }
+
+          //*** LOGOUT - all users
+          addNavItem(
+            t("Logout"),
+            "fa-sign-out-alt",
+            "/login",
+            [],
+            key++,
+            "logout"
+          );
         })
         .then(() => {
           //GET USER OPTIONS