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

Lesion Tracker Redesign so far

Browse Source
This commit is contained in:
Erik Ziegler committed 2016-07-22 11:00:16 +02:00
1 parent b247e89d8b
commit a9a4f3f82b
109 files changed
+2972 -936
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

LesionTracker/client/routes.js
+10 -8
View File
@@ -36,11 +36,11 @@ var routerOptions = {
Router.route('/', function() {
// Check user is logged in
if(Meteor.user() && Meteor.userId()) {
if (Meteor.user() && Meteor.userId()) {
if (verifyEmail && Meteor.user().emails && !Meteor.user().emails[0].verified) {
this.render('emailVerification', routerOptions);
} else {
this.render('worklist', routerOptions);
this.render('lesionTracker', routerOptions);
}
} else {
@@ -50,11 +50,11 @@ Router.route('/', function() {
Router.route('/worklist', function() {
// Check user is logged in
if(Meteor.user() && Meteor.userId()) {
if (Meteor.user() && Meteor.userId()) {
if (verifyEmail && Meteor.user().emails && !Meteor.user().emails[0].verified) {
this.render('emailVerification', routerOptions);
} else {
this.render('worklist', routerOptions);
this.render('lesionTracker', routerOptions);
}
} else {
@@ -77,15 +77,17 @@ Router.route('/viewer/timepoints/:_id', {
return;
}
this.render('worklist', routerOptions);
this.render('lesionTracker', routerOptions);
openNewTabWithTimepoint(timepointId);
}
});
Router.onBeforeAction(function () {
if (!Meteor.userId() && !Meteor.loggingIn()) {
Router.onBeforeAction(function() {
if (!Meteor.userId() && !Meteor.loggingIn()) {
this.render('entrySignIn');
} else {
this.next();
}
},{except: ['entrySignIn', 'entrySignUp', 'forgotPassword', 'resetPassword']});
}, {
except: ['entrySignIn', 'entrySignUp', 'forgotPassword', 'resetPassword']
});