eduvia/lms
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #346 from pateljannat/user-name-hooks-fix

Browse Source 
fix: renamed apps in hooks and rectified username validation conditions
This commit is contained in:
Jannat Patel
2022-06-23 10:26:35 +05:30
committed by GitHub
parent b2d38ad9d6 02e560cb18
commit f05d3581c1
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/hooks.py
View File

@@ -2,10 +2,10 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from . import __version__ as app_version from . import __version__ as app_version
app_name = "lms" app_name = "frappe_lms"
app_title = "LMS" app_title = "Frappe LMS"
app_publisher = "Frappe" app_publisher = "Frappe"
app_description = "LMS App" app_description = "Frappe LMS App"
app_icon = "octicon octicon-file-directory" app_icon = "octicon octicon-file-directory"
app_color = "grey" app_color = "grey"
app_email = "school@frappe.io" app_email = "school@frappe.io"

15
lms/overrides/user.py
View File

@@ -20,9 +20,9 @@ class CustomUser(User):
def validate_username_characters(self): def validate_username_characters(self):
if len(self.username): if len(self.username):
underscore_condition = self.username[0] == "_" or self.username[-1] == "_" other_conditions = self.username[0] == "_" or self.username[-1] == "_" or "-" in self.username
else: else:
underscore_condition = '' other_conditions = ''
regex = re.compile('[@!#$%^&*()<>?/\|}{~:-]') regex = re.compile('[@!#$%^&*()<>?/\|}{~:-]')
@@ -33,12 +33,12 @@ class CustomUser(User):
if self.username.find(" "): if self.username.find(" "):
self.username.replace(" ", "") self.username.replace(" ", "")
if regex.search(self.username) or underscore_condition:
self.username = self.remove_illegal_characters()
if len(self.username) < 4: if len(self.username) < 4:
self.username = self.email.replace("@", "").replace(".", "") self.username = self.email.replace("@", "").replace(".", "")
if regex.search(self.username) or other_conditions:
self.username = self.remove_illegal_characters()
while self.username_exists(): while self.username_exists():
self.username = self.remove_illegal_characters() + str(random.randint(0, 99)) self.username = self.remove_illegal_characters() + str(random.randint(0, 99))
@@ -49,7 +49,10 @@ class CustomUser(User):
if regex.search(self.username): if regex.search(self.username):
frappe.throw(_("Username can only contain alphabets, numbers and underscore.")) frappe.throw(_("Username can only contain alphabets, numbers and underscore."))
if underscore_condition: if other_conditions:
if "-" in self.username:
frappe.throw(_("Username cannot contain a Hyphen(-)"))
else:
frappe.throw(_("First and Last character of username cannot be Underscore(_).")) frappe.throw(_("First and Last character of username cannot be Underscore(_)."))
if len(self.username) < 4: if len(self.username) < 4: