diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py index 4b78ae2320..250c671758 100644 --- a/frappe/core/doctype/user/user.py +++ b/frappe/core/doctype/user/user.py @@ -507,6 +507,13 @@ def update_password(new_password, key=None, old_password=None): user_doc, redirect_url = reset_user_data(user) + # get redirect url from cache + redirect_to = frappe.cache().hset('redirect_after_login', user.name) + if redirect_to: + redirect_url = redirect_to + frappe.cache().hdel('redirect_after_login', user.name) + + frappe.local.login_manager.login_as(user) if user_doc.user_type == "System User": diff --git a/frappe/core/web_form/edit_profile/edit_profile.json b/frappe/core/web_form/edit_profile/edit_profile.json index 1d5b984562..ecf1e5ba70 100644 --- a/frappe/core/web_form/edit_profile/edit_profile.json +++ b/frappe/core/web_form/edit_profile/edit_profile.json @@ -3,6 +3,7 @@ "allow_delete": 0, "allow_edit": 1, "allow_multiple": 0, + "breadcrumbs": "[{\"title\": _(\"My Account\"), \"route\": \"me\"}]", "creation": "2016-09-19 05:16:59.242754", "doc_type": "User", "docstatus": 0, @@ -10,13 +11,14 @@ "idx": 0, "is_standard": 1, "login_required": 1, - "modified": "2016-09-23 03:08:15.206534", + "modified": "2016-09-24 04:31:41.920694", "modified_by": "Administrator", "module": "Core", "name": "edit-profile", "owner": "Administrator", "published": 1, "route": "update-profile", + "show_sidebar": 1, "sidebar_items": [], "success_message": "Profile updated successfully.", "success_url": "/me", @@ -70,15 +72,6 @@ "read_only": 0, "reqd": 0 }, - { - "fieldname": "gender", - "fieldtype": "Select", - "hidden": 0, - "label": "Gender", - "options": "\nMale\nFemale\nOther", - "read_only": 0, - "reqd": 0 - }, { "description": "", "fieldname": "language", @@ -88,30 +81,6 @@ "options": "Language", "read_only": 0, "reqd": 0 - }, - { - "fieldname": "birth_date", - "fieldtype": "Date", - "hidden": 0, - "label": "Birth Date", - "read_only": 0, - "reqd": 0 - }, - { - "fieldname": "location", - "fieldtype": "Data", - "hidden": 0, - "label": "Location", - "read_only": 0, - "reqd": 0 - }, - { - "fieldname": "bio", - "fieldtype": "Text", - "hidden": 0, - "label": "Bio", - "read_only": 0, - "reqd": 0 } ] } \ No newline at end of file diff --git a/frappe/templates/generators/web_form.html b/frappe/templates/generators/web_form.html index 868adf2eaa..1dd792a1bd 100644 --- a/frappe/templates/generators/web_form.html +++ b/frappe/templates/generators/web_form.html @@ -7,11 +7,13 @@ {% endblock %} {% block breadcrumbs %} +{% if has_header %} {% include "templates/includes/breadcrumbs.html" %} +{% endif %} {% endblock %} {% block header_actions %} - {% if frappe.form_dict.name or frappe.form_dict.new %} + {% if has_header %} {{ _("Cancel") }}