From d5fecab6209f1ccacead4caa7e7422282ec270d7 Mon Sep 17 00:00:00 2001 From: britlog Date: Mon, 19 Jun 2017 22:35:10 +0200 Subject: [PATCH 1/2] Change welcome email subject and delete username regex --- frappe/core/doctype/user/user.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py index 25bf87c4be..6df3661c3f 100644 --- a/frappe/core/doctype/user/user.py +++ b/frappe/core/doctype/user/user.py @@ -236,9 +236,9 @@ class User(Document): 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: - subject = _("Welcome to {0}").format(app_title[0]) + subject = _("Welcome to {0}").format(frappe.db.get_default('company')) else: subject = _("Complete Registration") @@ -401,11 +401,6 @@ class User(Document): 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): """ test password strength """ if self.__new_password: From 87d5ee265031be63c77f5b8b2eb4081269155001 Mon Sep 17 00:00:00 2001 From: mbauskar Date: Wed, 21 Jun 2017 17:50:24 +0530 Subject: [PATCH 2/2] [minor] get company name from get_site_info hook for welcome email --- frappe/core/doctype/user/user.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py index 6df3661c3f..74cf8fc9d5 100644 --- a/frappe/core/doctype/user/user.py +++ b/frappe/core/doctype/user/user.py @@ -236,9 +236,11 @@ class User(Document): link = self.reset_password() - app_title = [t for t in frappe.get_hooks('app_title') if t == 'ERPNext'] - if app_title: - subject = _("Welcome to {0}").format(frappe.db.get_default('company')) + method = frappe.get_hooks('get_site_info') + if method: + get_site_info = frappe.get_attr(method[0]) + info = get_site_info({}) + subject = _("Welcome to {0}").format(info.get('company')) else: subject = _("Complete Registration")