Merge userManagement branch to master

This commit is contained in:
Aysel Afsar committed 2016-02-14 20:45:04 -05:00
commit 3b7330ca75
37 files changed
+1829 -165

No files matched your search

+12 -2
View File
@@ -30,11 +30,21 @@ var routerOptions = {
};
Router.route('/', function() {
this.render('worklist', routerOptions);
// Check user is logged in
if (!Meteor.user() || !Meteor.userId()) {
this.render('entrySignIn', routerOptions);
} else{
this.render('worklist', routerOptions);
}
});
Router.route('/worklist', function() {
this.render('worklist', routerOptions);
// Check user is logged in
if (!Meteor.user() || !Meteor.userId()) {
this.render('entrySignIn', routerOptions);
} else{
this.render('worklist', routerOptions);
}
});
Router.route('/viewer/timepoints/:_id', {