Skip to content

Commit c0069d5

Browse files
committed
Move settings creation to flask util
1 parent b52c155 commit c0069d5

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

conditional/__init__.py

-7
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
# pylint: disable=C0413
1616

17-
from conditional.models.models import EvalSettings
1817
from conditional.blueprints.dashboard import dashboard_bp
1918
from conditional.blueprints.attendance import attendance_bp
2019
from conditional.blueprints.major_project_submission import major_project_bp
@@ -39,12 +38,6 @@
3938

4039
logger.info('conditional started')
4140

42-
if EvalSettings.query.first() is None:
43-
logger.info("Generating Initial Site Settings")
44-
db.add(EvalSettings())
45-
db.flush()
46-
db.commit()
47-
4841

4942
@app.route('/<path:path>')
5043
def static_proxy(path):

conditional/util/flask.py

+7
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,19 @@
77
from conditional.util.ldap import ldap_is_financial_director
88
from conditional.util.ldap import ldap_is_eval_director
99
from conditional.util.ldap import ldap_is_intromember
10+
from conditional import db
1011

1112

1213
def render_template(request, template_name, **kwargs):
1314
user_name = request.headers.get('x-webauth-user')
1415

1516
# TODO maybe use the webauth request decorator
17+
18+
if EvalSettings.query.first() is None:
19+
db.session.add(EvalSettings())
20+
db.session.flush()
21+
db.session.commit()
22+
1623
lockdown = EvalSettings.query.first().site_lockdown
1724
is_active = ldap_is_active(user_name)
1825
is_alumni = ldap_is_alumni(user_name)

0 commit comments

Comments
 (0)