fix: user validaton and community member name issue

This commit is contained in:
pateljannat
2021-04-28 13:08:09 +05:30
parent d68f1de796
commit c6bd47eb62
7 changed files with 71 additions and 44 deletions

View File

@@ -11,15 +11,15 @@
"email",
"enabled",
"column_break_4",
"role",
"short_intro",
"username",
"email_preference",
"section_break_7",
"bio",
"section_break_9",
"username",
"role",
"photo",
"column_break_12",
"email_preference",
"short_intro",
"route",
"abbr"
],
@@ -77,8 +77,10 @@
"unique": 1
},
{
"allow_in_quick_entry": 1,
"fieldname": "username",
"fieldtype": "Data",
"in_list_view": 1,
"label": "User Name",
"unique": 1
},
@@ -111,10 +113,9 @@
"read_only": 1
}
],
"has_web_view": 1,
"index_web_pages_for_search": 1,
"links": [],
"modified": "2021-04-16 10:22:46.837311",
"modified": "2021-04-28 11:22:35.402217",
"modified_by": "Administrator",
"module": "Community",
"name": "Community Member",

View File

@@ -4,12 +4,12 @@
from __future__ import unicode_literals
import frappe
from frappe.website.website_generator import WebsiteGenerator
import re
from frappe import _
from frappe.model.rename_doc import rename_doc
from frappe.model.document import Document
import random
class CommunityMember(WebsiteGenerator):
class CommunityMember(Document):
def validate(self):
self.validate_username()
@@ -18,6 +18,9 @@ class CommunityMember(WebsiteGenerator):
self.route = self.username
def validate_username(self):
if not self.username:
self.username = create_username_from_email(self.email)
if self.username:
if len(self.username) < 4:
frappe.throw(_("Username must be atleast 4 characters long."))
@@ -26,12 +29,29 @@ class CommunityMember(WebsiteGenerator):
self.username = self.username.lower()
def create_member_from_user(doc, method):
if ( doc.username and username_exists(doc.username)) or not doc.username:
username = create_username_from_email(doc.email)
if len(doc.username) < 4:
username = adjust_username(doc.username)
if username_exists(username):
username = username + str(random.randint(0,9))
member = frappe.get_doc({
"doctype": "Community Member",
"full_name": doc.full_name,
"username": doc.username if len(doc.username) > 3 else ("").join([ s for s in doc.full_name.split() ]),
"username": username,
"email": doc.email,
"route": doc.username,
"owner": doc.email
})
member.save(ignore_permissions=True)
def username_exists(username):
return frappe.db.exists("Community Member", dict(username=username))
def create_username_from_email(email):
string = email.split("@")[0]
return ''.join(e for e in string if e.isalnum())
def adjust_username(username):
return username.ljust(4, str(random.randint(0,9)))

View File

@@ -7,4 +7,6 @@ from __future__ import unicode_literals
import unittest
class TestCommunityMember(unittest.TestCase):
pass
def test_member_created_from_user():
pass

View File

@@ -7,7 +7,6 @@ def create_members_from_users():
doc = frappe.get_doc("User", {"email": user.email})
username = doc.username if doc.username and len(doc.username) > 3 else ("").join([ s for s in doc.full_name.split() ])
if not frappe.db.exists("Community Member", username):
print(doc.email, username)
member = frappe.new_doc("Community Member")
member.full_name = doc.full_name
member.username = username