From e277c4b484916181e1e32d17063560e2a5be4058 Mon Sep 17 00:00:00 2001
From: Aysel Afsar <aysel.afsar@gmail.com>
Date: Mon, 4 Apr 2016 12:43:46 -0400
Subject: [PATCH] Fix user account menu by current path

---
 .../userAccountMenu/userAccountMenu.html      |  2 +-
 .../userAccountMenu/userAccountMenu.js        | 31 +++++--------------
 2 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/Packages/lesiontracker/client/components/userAccountMenu/userAccountMenu.html b/Packages/lesiontracker/client/components/userAccountMenu/userAccountMenu.html
index d8e49f6de..7049a6acb 100644
--- a/Packages/lesiontracker/client/components/userAccountMenu/userAccountMenu.html
+++ b/Packages/lesiontracker/client/components/userAccountMenu/userAccountMenu.html
@@ -2,7 +2,7 @@
     {{#if currentUser}}
         <div id="userAccountMenu" class="row-fluid">
             <div class="list-group panel">
-                <a href="#userMenu" class="list-group-item" id="userName" data-toggle="collapse" data-parent="#userAccountMenu">{{fullName}} <span class="caret"></span></a>
+                <a href="#userMenu" class="list-group-item" id="userName" data-toggle="collapse" data-parent="#userAccountMenu">{{fullName}} {{currentPath}}<span class="caret"></span></a>
 
                 <div class="collapse pos-absolute" id="userMenu">
 
diff --git a/Packages/lesiontracker/client/components/userAccountMenu/userAccountMenu.js b/Packages/lesiontracker/client/components/userAccountMenu/userAccountMenu.js
index 0064b4eab..3fbaf0487 100644
--- a/Packages/lesiontracker/client/components/userAccountMenu/userAccountMenu.js
+++ b/Packages/lesiontracker/client/components/userAccountMenu/userAccountMenu.js
@@ -2,11 +2,6 @@ Template.userAccountMenu.helpers({
     fullName: function() {
         return Meteor.user().profile.fullName;
     },
-
-    showWorklistMenu: function() {
-        return  Template.instance().showWorklistMenu.get();
-    },
-
     currentUser: function() {
         var verifyEmail = Meteor.settings && Meteor.settings.public && Meteor.settings.public.verifyEmail || false;
 
@@ -27,16 +22,13 @@ Template.userAccountMenu.helpers({
         }
 
         return false;
-    }
-});
-
-Template.userAccountMenu.onCreated(function() {
-    // showViewer to go to viewer from audit
-    this.showWorklistMenu = new ReactiveVar(false);
-    // Get url and check worklist
-    var currentPath = Router.current().route.path(this);
-    if (currentPath === '/audit' || currentPath === '/changePassword') {
-        this.showWorklistMenu.set(true);
+    },
+    showWorklistMenu: function() {
+        var currentPath = Router.current().route.path(this);
+        if (currentPath === '/' || currentPath === '/worklist') {
+            return false;
+        }
+        return true;
     }
 });
 
@@ -50,14 +42,5 @@ Template.userAccountMenu.events({
         Meteor.logout(function() {
             Router.go('/entrySignIn');
         });
-    },
-    'click #worklist': function(e, template) {
-        template.showWorklistMenu.set(false);
-    },
-    'click #audit': function(e, template) {
-        template.showWorklistMenu.set(true);
-    },
-    'click #changePassword': function(e, template) {
-        template.showWorklistMenu.set(true);
     }
 });
\ No newline at end of file