Merge branch 'master' into rs
This commit is contained in:
commit
ce68f61292
|
@ -15,7 +15,7 @@ except ImportError:
|
||||||
|
|
||||||
from redis import Redis
|
from redis import Redis
|
||||||
from rq import Queue
|
from rq import Queue
|
||||||
from bottle import Bottle, default_app
|
from bottle import Bottle, default_app, debug
|
||||||
from bottle import request, response, template, static_file
|
from bottle import request, response, template, static_file
|
||||||
|
|
||||||
config = RawConfigParser()
|
config = RawConfigParser()
|
||||||
|
@ -232,6 +232,6 @@ if __name__ == '__main__':
|
||||||
host=config.get('portal', 'listen_host'),
|
host=config.get('portal', 'listen_host'),
|
||||||
port=config.getint('portal', 'listen_port')
|
port=config.getint('portal', 'listen_port')
|
||||||
)
|
)
|
||||||
debug(config.getbool('portal', 'debug'))
|
debug(config.getboolean('portal', 'debug'))
|
||||||
else:
|
else:
|
||||||
application = app
|
application = app
|
||||||
|
|
|
@ -174,4 +174,5 @@ $('#approveForm').submit(function (event) {
|
||||||
do_error(XMLHttpRequest.responseText);
|
do_error(XMLHttpRequest.responseText);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue