Cleaned up some minor issues with last feature
This commit is contained in:
parent
3d0fb303e1
commit
78d7bbe31a
|
@ -17,18 +17,18 @@ function get(req, res, next, search) {
|
||||||
if (!config().localDatabase) {
|
if (!config().localDatabase) {
|
||||||
index.find({$or : [{id : search}, {name : search}, {first_name : search}, {last_name : search}, {username: search}]}).toArray(function (err, databaseEntry) {
|
index.find({$or : [{id : search}, {name : search}, {first_name : search}, {last_name : search}, {username: search}]}).toArray(function (err, databaseEntry) {
|
||||||
if (err) console.warn(err);
|
if (err) console.warn(err);
|
||||||
handle(req, next, databaseEntry);
|
handle(req, res, next, databaseEntry);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
index.find({$or : [{id : search}, {name : search}, {first_name : search}, {last_name : search}, {username: search}]}, function (err, databaseEntry) {
|
index.find({$or : [{id : search}, {name : search}, {first_name : search}, {last_name : search}, {username: search}]}, function (err, databaseEntry) {
|
||||||
if (err) console.warn(err);
|
if (err) console.warn(err);
|
||||||
handle(req, next, databaseEntry);
|
handle(req, res, next, databaseEntry);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function handle(req, next, databaseEntry) {
|
function handle(req, res, next, databaseEntry) {
|
||||||
if ((req.easter || {}).type == 'RIP') {
|
if ((req.easter || {}).type == 'RIP') {
|
||||||
require('./auth').is(req, res, function () {
|
require('./auth').is(req, res, function () {
|
||||||
res.render('schedule', req);
|
res.render('schedule', req);
|
||||||
|
|
|
@ -3,7 +3,7 @@ var cheerio = require('cheerio');
|
||||||
var iconv = require('iconv-lite');
|
var iconv = require('iconv-lite');
|
||||||
var config = require('./configuration');
|
var config = require('./configuration');
|
||||||
var url = require('url');
|
var url = require('url');
|
||||||
var database = require('./')();
|
var database = require('./database')();
|
||||||
|
|
||||||
var scheduletypes = [
|
var scheduletypes = [
|
||||||
'Klasrooster',
|
'Klasrooster',
|
||||||
|
|
Loading…
Reference in a new issue