|
|
@@ -18,7 +18,7 @@ login.bind_events = function() { |
|
|
|
args.pwd = $("#login_password").val(); |
|
|
|
args.device = "desktop"; |
|
|
|
if(!args.usr || !args.pwd) { |
|
|
|
frappe.msgprint(__("Both login and password required")); |
|
|
|
frappe.msgprint("{{ _("Both login and password required") }}"); |
|
|
|
return false; |
|
|
|
} |
|
|
|
login.call(args); |
|
|
@@ -33,7 +33,7 @@ login.bind_events = function() { |
|
|
|
args.redirect_to = get_url_arg("redirect-to") || ''; |
|
|
|
args.full_name = ($("#signup_fullname").val() || "").trim(); |
|
|
|
if(!args.email || !valid_email(args.email) || !args.full_name) { |
|
|
|
login.set_indicator(__("Valid email and name required"), 'red'); |
|
|
|
login.set_indicator("{{ _("Valid email and name required") }}", 'red'); |
|
|
|
return false; |
|
|
|
} |
|
|
|
login.call(args); |
|
|
@@ -46,7 +46,7 @@ login.bind_events = function() { |
|
|
|
args.cmd = "frappe.core.doctype.user.user.reset_password"; |
|
|
|
args.user = ($("#forgot_email").val() || "").trim(); |
|
|
|
if(!args.user) { |
|
|
|
login.set_indicator(__("Valid Login id required."), 'red'); |
|
|
|
login.set_indicator("{{ _("Valid Login id required.") }}", 'red'); |
|
|
|
return false; |
|
|
|
} |
|
|
|
login.call(args); |
|
|
@@ -60,7 +60,7 @@ login.bind_events = function() { |
|
|
|
args.pwd = $("#login_password").val(); |
|
|
|
args.device = "desktop"; |
|
|
|
if(!args.usr || !args.pwd) { |
|
|
|
login.set_indicator(__("Both login and password required"), 'red'); |
|
|
|
login.set_indicator("{{ _("Both login and password required") }}", 'red'); |
|
|
|
return false; |
|
|
|
} |
|
|
|
login.call(args); |
|
|
@@ -103,7 +103,7 @@ login.signup = function() { |
|
|
|
|
|
|
|
// Login |
|
|
|
login.call = function(args, callback) { |
|
|
|
login.set_indicator(__('Verifying...'), 'blue'); |
|
|
|
login.set_indicator("{{ _('Verifying...') }}", 'blue'); |
|
|
|
return frappe.call({ |
|
|
|
type: "POST", |
|
|
|
args: args, |
|
|
@@ -149,10 +149,10 @@ login.login_handlers = (function() { |
|
|
|
var login_handlers = { |
|
|
|
200: function(data) { |
|
|
|
if(data.message=="Logged In") { |
|
|
|
login.set_indicator(__("Success"), 'green'); |
|
|
|
login.set_indicator("{{ _("Success") }}", 'green'); |
|
|
|
window.location.href = get_url_arg("redirect-to") || data.home_page; |
|
|
|
} else if(data.message=="No App") { |
|
|
|
login.set_indicator(__("Success"), 'green'); |
|
|
|
login.set_indicator("{{ _("Success") }}", 'green'); |
|
|
|
if(localStorage) { |
|
|
|
var last_visited = |
|
|
|
localStorage.getItem("last_visited") |
|
|
@@ -171,11 +171,11 @@ login.login_handlers = (function() { |
|
|
|
} |
|
|
|
} else if(window.location.hash === '#forgot') { |
|
|
|
if(data.message==='not found') { |
|
|
|
login.set_indicator(__("Not a valid user"), 'red'); |
|
|
|
login.set_indicator("{{ _("Not a valid user") }}", 'red'); |
|
|
|
} else if (data.message=='not allowed') { |
|
|
|
login.set_indicator(__("Not Allowed"), 'red'); |
|
|
|
login.set_indicator("{{ _("Not Allowed") }}", 'red'); |
|
|
|
} else { |
|
|
|
login.set_indicator(__("Instructions Emailed"), 'green'); |
|
|
|
login.set_indicator("{{ _("Instructions Emailed") }}", 'green'); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@@ -183,14 +183,14 @@ login.login_handlers = (function() { |
|
|
|
if(cint(data.message[0])==0) { |
|
|
|
login.set_indicator(data.message[1], 'red'); |
|
|
|
} else { |
|
|
|
login.set_indicator(__('Success'), 'green'); |
|
|
|
login.set_indicator("{{ _('Success') }}", 'green'); |
|
|
|
frappe.msgprint(data.message[1]) |
|
|
|
} |
|
|
|
//login.set_indicator(__(data.message), 'green'); |
|
|
|
} |
|
|
|
}, |
|
|
|
401: get_error_handler(__("Invalid Login. Try again.")), |
|
|
|
417: get_error_handler(__("Oops! Something went wrong")) |
|
|
|
401: get_error_handler("{{ _("Invalid Login. Try again.") }}"), |
|
|
|
417: get_error_handler("{{ _("Oops! Something went wrong") }}") |
|
|
|
}; |
|
|
|
|
|
|
|
return login_handlers; |
|
|
|