diff --git a/frappe/custom/doctype/customize_form/test_customize_form.py b/frappe/custom/doctype/customize_form/test_customize_form.py index 197aa99f46..ffa82c3b00 100644 --- a/frappe/custom/doctype/customize_form/test_customize_form.py +++ b/frappe/custom/doctype/customize_form/test_customize_form.py @@ -46,7 +46,7 @@ class TestCustomizeForm(unittest.TestCase): d = self.get_customize_form("Event") self.assertEquals(d.doc_type, "Event") - self.assertEquals(len(d.get("fields")), 27) + self.assertEquals(len(d.get("fields")), 29) d = self.get_customize_form("User") self.assertEquals(d.doc_type, "User") diff --git a/frappe/templates/includes/login/login.js b/frappe/templates/includes/login/login.js index 652ee1f244..633dc15a45 100644 --- a/frappe/templates/includes/login/login.js +++ b/frappe/templates/includes/login/login.js @@ -170,11 +170,12 @@ login.login_handlers = (function() { window.location.href = data.home_page; } } else if(window.location.hash === '#forgot') { - console.log(data.message); if(data.message==='not found') { login.set_indicator(__("Not a valid user"), 'red'); } else if (data.message=='not allowed') { login.set_indicator(__("Not Allowed"), 'red'); + } else { + login.set_indicator(__("Instructions Emailed"), 'green'); }