Commit d15bc9fa authored by Ravi Tripathi's avatar Ravi Tripathi
Browse files

Merge branch 'feat-variable-consistency' into 'master'

fixed variable naming convention

See merge request rc/self-reg-form!40
parents 6f86d81d efc700cb
...@@ -48,18 +48,18 @@ def create_app(config_name): ...@@ -48,18 +48,18 @@ def create_app(config_name):
session['return_url'] = request.args.get('redir', vars.default_referrer) session['return_url'] = request.args.get('redir', vars.default_referrer)
if (not any(item in session['user'].get('eppa') for item in valid_eppa)): if (not any(item in session['user'].get('eppa') for item in valid_eppa)):
return render_template('account/unauthorized.html', unauthorized_message=messages.unauthorized_message) return render_template('account/unauthorized.html', unauthorized_msg=messages.unauthorized_message)
if rc_util.check_state(session['user'].get('username')) == "blocked": if rc_util.check_state(session['user'].get('username')) == "blocked":
return render_template('account/blocked.html', unauthorized_message=messages.unauthorized_message) return render_template('account/blocked.html', unauthorized_msg=messages.unauthorized_message)
elif rc_util.check_state(session['user'].get('username')) == "certification": elif rc_util.check_state(session['user'].get('username')) == "certification":
return render_template('account/certify.html', room_id=session['uid'], return render_template('account/certify.html', room_id=session['uid'],
username=session['user'].get('username'), username=session['user'].get('username'),
fullname=session['user'].get('fullname'), email=session['user'].get('email'), fullname=session['user'].get('fullname'), email=session['user'].get('email'),
referrer=session['return_url'], cancel_url=vars.default_referrer, referrer=session['return_url'], cancel_url=vars.default_referrer,
cancel_msg=messages.cancel_message, cancel_msg=messages.cancel_message,
pre_certification_msg=messages.pre_certification_message, pre_certification_msg=messages.pre_certification_message,
certification_msg=messages.certification_message) certification_msg=messages.certification_message)
elif rc_util.check_state(session['user'].get('username')) == "ok": elif rc_util.check_state(session['user'].get('username')) == "ok":
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
<div class="col-md-10 col-sm-10 my-col"> <div class="col-md-10 col-sm-10 my-col">
<div id="form-wrapper"> <div id="form-wrapper">
<h2> Account blocked </h2> <h2> Account blocked </h2>
<p style="font-size:110%;"> {{ unauthorized_message |safe }}</p> <p style="font-size:110%;"> {{ unauthorized_msg |safe }}</p>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
<div class="col-md-10 col-sm-10 my-col"> <div class="col-md-10 col-sm-10 my-col">
<div id="form-wrapper"> <div id="form-wrapper">
<h2> Account Authorization error </h2> <h2> Account Authorization error </h2>
<p style="font-size:110%;"> {{ unauthorized_message |safe }}</p> <p style="font-size:110%;"> {{ unauthorized_msg |safe }}</p>
</div> </div>
</div> </div>
</div> </div>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment