Merge pull request #4114 from shridarpatil/develop

Login with username

frappe/auth.py

@@ -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'

frappe/core/doctype/system_settings/system_settings.json

@@ -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, 
@@ -1248,8 +1281,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": "", 

frappe/www/login.html

@@ -16,10 +16,7 @@
 			</div>
 
 			<input type="text" id="login_email"
-				class="form-control" placeholder="{{
-					_('Email address or Mobile number')
-					if frappe.utils.cint(frappe.db.get_value('System Settings', 'System Settings', 'allow_login_using_mobile_number'))
-					else _('Email address') }}"
+				class="form-control" placeholder="{{ login_name_placeholder  }}"
 				required autofocus>
 
 

frappe/www/login.py

@@ -31,6 +31,16 @@ def get_context(context):
 	ldap_settings = get_ldap_settings()
 	context["ldap_settings"] = ldap_settings
 
+	login_name_placeholder = [_("Email address")]
+
+	if frappe.utils.cint(frappe.get_system_settings("allow_login_using_mobile_number")):
+		login_name_placeholder.append(_("Mobile number"))
+
+	if frappe.utils.cint(frappe.get_system_settings("allow_login_using_user_name")):
+		login_name_placeholder.append(_("Username"))
+
+	context['login_name_placeholder'] = ' {0} '.format(_('or')).join(login_name_placeholder)
+
 	return context
 
 @frappe.whitelist(allow_guest=True)