Removing serverInformationModal from DOM

This commit is contained in:
Bruno Alves de Faria committed 2017-03-21 10:16:46 -03:00
1 parent 2a5699a5b7
commit 91abaf8a60
19 files changed
+72 -86

No files matched your search

+10 -13
View File
@@ -1,10 +1,12 @@
import { Meteor } from 'meteor/meteor';
import { Session } from 'meteor/session';
import { Router } from 'meteor/iron:router';
import { OHIF } from 'meteor/ohif:core';
Session.setDefault('ViewerData', {});
// verifyEmail controls whether emailVerification template will be rendered or not
var verifyEmail = Meteor.settings && Meteor.settings.public && Meteor.settings.public.verifyEmail || false;
const verifyEmail = Meteor.settings && Meteor.settings.public && Meteor.settings.public.verifyEmail || false;
Router.configure({
layoutTemplate: 'layout',
@@ -13,34 +15,29 @@ Router.configure({
Router.onBeforeAction('loading');
var data = {
const data = {
additionalTemplates: [
'serverInformationModal',
'lastLoginModal',
'viewSeriesDetailsModal'
]
};
var routerOptions = {
data: data
};
const routerOptions = { data };
Router.route('/', function() {
// Check user is logged in
if (Meteor.user() && Meteor.userId()) {
if (verifyEmail && Meteor.user().emails && !Meteor.user().emails[0].verified) {
this.render('emailVerification', routerOptions);
}
else {
} else {
const contentId = Session.get('activeContentId');
if(!contentId) {
if (!contentId) {
Session.set('activeContentId', 'studylistTab');
}
this.render('app', routerOptions);
}
}
else {
} else {
this.render('entrySignIn', routerOptions);
}
});
@@ -49,7 +46,7 @@ Router.route('/viewer/timepoints/:_id', {
layoutTemplate: 'layout',
name: 'viewer',
onBeforeAction: function() {
var timepointId = this.params._id;
const timepointId = this.params._id;
this.render('app', routerOptions);
OHIF.lesiontracker.openNewTabWithTimepoint(timepointId);