eduvia/lms
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: user and country data

Browse Source
This commit is contained in:
Jannat Patel
2021-12-17 19:42:57 +05:30
parent 0b83307f7d
commit 6a3442d058
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
school/overrides/user.py
View File

@@ -182,6 +182,7 @@ def sign_up(email, full_name, verify_age):
"email": email, "email": email,
"first_name": escape_html(full_name), "first_name": escape_html(full_name),
"verify_age": verify_age, "verify_age": verify_age,
"country": "",
"enabled": 1, "enabled": 1,
"new_password": random_string(10), "new_password": random_string(10),
"user_type": "Website User" "user_type": "Website User"
@@ -189,8 +190,7 @@ def sign_up(email, full_name, verify_age):
user.flags.ignore_permissions = True user.flags.ignore_permissions = True
user.flags.ignore_password_policy = True user.flags.ignore_password_policy = True
user.insert() user.insert()
set_country_from_ip(None, user.name)
set_country_from_ip(user.name)
# set default signup role as per Portal Settings # set default signup role as per Portal Settings
default_role = frappe.db.get_value("Portal Settings", None, "default_role") default_role = frappe.db.get_value("Portal Settings", None, "default_role")
@@ -203,14 +203,13 @@ def sign_up(email, full_name, verify_age):
return 2, _("Please ask your administrator to verify your sign-up") return 2, _("Please ask your administrator to verify your sign-up")
def set_country_from_ip(user=None): def set_country_from_ip(login_manager=None, user=None):
if not user: if not user and login_manager:
user = frappe.session.user user = login_manager.user
user_country = frappe.db.get_value("User", user, "country") user_country = frappe.db.get_value("User", user, "country")
if user_country: if user_country:
return return
frappe.db.set_value("User", user, "country", get_country_code()) frappe.db.set_value("User", user, "country", get_country_code())
return return