Fix user account menu by current path

This commit is contained in:
Aysel Afsar 2016-04-04 12:43:46 -04:00
parent 546d579c7a
commit e277c4b484
2 changed files with 8 additions and 25 deletions

View File

@ -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">

View File

@ -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);
}
});