Skip to content
Snippets Groups Projects
Commit 16ca4332 authored by Krish Moodbidri's avatar Krish Moodbidri
Browse files

Merge branch 'master' of https://gitlab.rc.uab.edu/rc/self-reg-form into fix-account-create-timeout

Conflicts:
	app/__init__.py
	tasks.py
parents 4dc47b39 4f1566da
No related branches found
No related tags found
No related merge requests found
...@@ -92,6 +92,8 @@ def create_app(config_name): ...@@ -92,6 +92,8 @@ def create_app(config_name):
if ( if (
rc_util.check_state(session["user"].get("username")) rc_util.check_state(session["user"].get("username"))
== "certification" == "certification"
or rc_util.check_state(session["user"].get("username"))
== "pre_certification"
): ):
return render_template( return render_template(
"account/certify.html", "account/certify.html",
......
...@@ -146,7 +146,6 @@ def celery_create_account(msg, session): ...@@ -146,7 +146,6 @@ def celery_create_account(msg, session):
This function is used to create account for new users This function is used to create account for new users
Input: Input:
json, string: json object of all user attributes and session/room json, string: json object of all user attributes and session/room
msg: json object of all user attributes and session/room
Output: Output:
gen_f(room): callback to check for success or failure gen_f(room): callback to check for success or failure
""" """
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment