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

Merge pull request #81 from fossunited/flow-fixes

Browse Source 
fix: username and email validations
This commit is contained in:
Anand Chitipothu
2021-05-07 18:53:58 +05:30
committed by GitHub
parent c40ab9a726 911c85bfc8
commit be7814b4fe
7 changed files with 44 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
community/lms/doctype/invite_request/invite_request.py
View File

@@ -47,6 +47,9 @@ class InviteRequest(Document):
@frappe.whitelist(allow_guest=True)
def create_invite_request(invite_email):
if not frappe.utils.validate_email_address(invite_email):
return "invalid email"
if frappe.db.exists("User", invite_email):
return "user"

42
community/lms/widgets/RequestInvite.html
View File

@@ -4,7 +4,8 @@
<input class="form-control w-100 mr-5 mb-5 mt-2" id="invite_email" type="email" placeholder="Email Address">
</div>
<div class="col-md">
<a type="submit" id="submit-invite-request" class="btn btn-primary btn-lg" href="#" role="button">Request Invite</a>
<a type="submit" id="submit-invite-request" class="btn btn-primary btn-lg" role="button">Request
Invite</a>
</div>
</div>
</form>
@@ -18,27 +19,44 @@
invite_email: invite_email
},
callback: (data) => {
$("#invite-request-form").hide();
if (data.message == "invalid email") {
$(".email-validation") && $(".email-validation").remove();
if (invite_email) {
var message = `<div>
<small class="email-validation" style="color: red;">${invite_email} is not a valid email address.</small>
</div>`;
}
else {
var message = `<div>
<small class="email-validation" style="color: red;">Please enter an email address.</small>
</div>`;
}
if (data.message == "OK") {
var message = `<div>
$("#invite-request-form").append(message);
}
else {
$("#invite-request-form").hide();
if (data.message == "OK") {
var message = `<div>
<p class="lead alert alert-secondary">Thanks for your interest in Mon School. We have recorded your interest and we will get back to you shortly.</p>
</div>`;
}
}
else if (data.message == "invite") {
var message = `<div>
else if (data.message == "invite") {
var message = `<div>
<p class="lead alert alert-secondary">Email ${invite_email} has already been used to request an invitation.</p>
</div>`;
}
}
else if (data.message == "user") {
var message = `<div>
else if (data.message == "user") {
var message = `<div>
<p class="lead alert alert-secondary">Looks like there is already an account with email ${invite_email}. Would you like to <a href="/login">login</a>?</p>
</div>`;
}
}
$(".jumbotron").append(message);
$(".jumbotron").append(message);
}
}
})
})