vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Login with username

Browse source 
https://github.com/frappe/frappe/issues/4106
This commit is contained in:
shridhar 2017-09-13 14:18:31 +05:30
parent d0d216475f
commit c436f965d3
2 changed files with 39 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
frappe/auth.py
View file

@ -199,6 +199,9 @@ class LoginManager:
if cint(frappe.db.get_value("System Settings", "System Settings", "allow_login_using_mobile_number")):
user = frappe.db.get_value("User", filters={"mobile_no": user}, fieldname="name") or user
if cint(frappe.db.get_value("System Settings", "System Settings", "allow_login_using_user_name")):
user = frappe.db.get_value("User", filters={"username": user}, fieldname="name") or user
self.check_if_enabled(user)
self.user = self.check_password(user, pwd)
@ -331,4 +334,4 @@ def get_website_user_home_page(user):
home_page = frappe.get_attr(home_page_method[-1])(user)
return '/' + home_page.strip('/')
else:
return '/me'
return '/me'

37
frappe/core/doctype/system_settings/system_settings.json
View file

@ -868,6 +868,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
"default": "0",
"description": "User can login using Email id or Mobile number",
"fieldname": "allow_login_using_mobile_number",
"fieldtype": "Check",
@ -893,6 +894,38 @@
"set_only_once": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"default": "0",
"description": "User can login using Email id or User Name",
"fieldname": "allow_login_using_user_name",
"fieldtype": "Check",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Allow Login using User Name",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
@ -1216,8 +1249,8 @@
"issingle": 1,
"istable": 0,
"max_attachments": 0,
"modified": "2017-08-31 14:53:31.065925",
"modified_by": "ewfds@wfe.ef",
"modified": "2017-09-13 13:26:11.045262",
"modified_by": "shri@zerodha.com",
"module": "Core",
"name": "System Settings",
"name_case": "",