[MERGE] forward port of branch saas-3 up to 685fa26

This commit is contained in:
Denis Ledoux
2014-09-15 15:24:19 +02:00
+1 -1
View File
@@ -119,7 +119,7 @@ def ensure_db(redirect='/web/database/selector'):
abort_and_redirect(url_redirect) abort_and_redirect(url_redirect)
# if db not provided, use the session one # if db not provided, use the session one
if not db and http.db_filter([request.session.db]): if not db and request.session.db and http.db_filter([request.session.db]):
db = request.session.db db = request.session.db
# if no database provided and no database in session, use monodb # if no database provided and no database in session, use monodb