TrizTech/ohif-viewer
15
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix user account menu by current path

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Packages/lesiontracker/client/components/userAccountMenu/userAccountMenu.html
View File

@ -2,7 +2,7 @@
{{#if currentUser}} {{#if currentUser}}
<div id="userAccountMenu" class="row-fluid"> <div id="userAccountMenu" class="row-fluid">
<div class="list-group panel"> <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"> <div class="collapse pos-absolute" id="userMenu">

31
Packages/lesiontracker/client/components/userAccountMenu/userAccountMenu.js
View File

@ -2,11 +2,6 @@ Template.userAccountMenu.helpers({
fullName: function() { fullName: function() {
return Meteor.user().profile.fullName; return Meteor.user().profile.fullName;
}, },
showWorklistMenu: function() {
return Template.instance().showWorklistMenu.get();
},
currentUser: function() { currentUser: function() {
var verifyEmail = Meteor.settings && Meteor.settings.public && Meteor.settings.public.verifyEmail || false; var verifyEmail = Meteor.settings && Meteor.settings.public && Meteor.settings.public.verifyEmail || false;
@ -27,16 +22,13 @@ Template.userAccountMenu.helpers({
} }
return false; return false;
} },
}); showWorklistMenu: function() {
var currentPath = Router.current().route.path(this);
Template.userAccountMenu.onCreated(function() { if (currentPath === '/' || currentPath === '/worklist') {
// showViewer to go to viewer from audit return false;
this.showWorklistMenu = new ReactiveVar(false); }
// Get url and check worklist return true;
var currentPath = Router.current().route.path(this);
if (currentPath === '/audit' || currentPath === '/changePassword') {
this.showWorklistMenu.set(true);
} }
}); });
@ -50,14 +42,5 @@ Template.userAccountMenu.events({
Meteor.logout(function() { Meteor.logout(function() {
Router.go('/entrySignIn'); 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);
} }
}); });