britlog
8 years ago
committed by
mbauskar
mbauskar
1 changed files with 2 additions and 7 deletions
Unified View
Diff Options
+ 2
- 7
frappe/core/doctype/user/user.py
View File
| @@ -236,9 +236,9 @@ class User(Document): | |||||
| link = self.reset_password() | link = self.reset_password() | ||||
| app_title = [t for t in frappe.get_hooks('app_title') if t != 'Frappe Framework'] | |||||
| app_title = [t for t in frappe.get_hooks('app_title') if t == 'ERPNext'] | |||||
| if app_title: | if app_title: | ||||
| subject = _("Welcome to {0}").format(app_title[0]) | |||||
| subject = _("Welcome to {0}").format(frappe.db.get_default('company')) | |||||
| else: | else: | ||||
| subject = _("Complete Registration") | subject = _("Complete Registration") | ||||
| @@ -401,11 +401,6 @@ class User(Document): | |||||
| self.username = "" | self.username = "" | ||||
| # should be made up of characters, numbers and underscore only | |||||
| if self.username and not re.match(r"^[\w]+$", self.username): | |||||
| frappe.msgprint(_("Username should not contain any special characters other than letters, numbers and underscore")) | |||||
| self.username = "" | |||||
| def password_strength_test(self): | def password_strength_test(self): | ||||
| """ test password strength """ | """ test password strength """ | ||||
| if self.__new_password: | if self.__new_password: | ||||