vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

[fixes] [web forms]

Browse source
This commit is contained in:
Rushabh Mehta 2016-09-24 14:09:50 +05:30
parent 59af5bfbf3
commit 97558a5910
5 changed files with 21 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
frappe/core/doctype/user/user.py
View file

@ -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":

37
frappe/core/web_form/edit_profile/edit_profile.json
View file

@ -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
}
]
}

4
frappe/templates/generators/web_form.html
View file

@ -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 %}
<a href="{{ cancel_url or pathname }}" class="btn btn-default btn-sm">
{{ _("Cancel") }}</a>
<button type="submit" class="btn btn-primary btn-sm btn-form-submit">

4
frappe/website/doctype/web_form/web_form.json
View file

@ -611,7 +611,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
"description": "In JSON as [{\"title\":\"Jobs\", \"name\":\"jobs\"}]",
"description": "List as [{\"label\": _(\"Jobs\"), \"route\":\"jobs\"}]",
"fieldname": "breadcrumbs",
"fieldtype": "Code",
"hidden": 0,
@ -645,7 +645,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
"modified": "2016-09-23 12:15:14.857671",
"modified": "2016-09-24 04:30:55.457020",
"modified_by": "Administrator",
"module": "Website",
"name": "Web Form",

7
frappe/website/doctype/web_form/web_form.py
View file

@ -151,6 +151,12 @@ def get_context(context):
context.parents = self.get_parents(context)
if self.breadcrumbs:
context.parents = eval(self.breadcrumbs)
context.has_header = ((frappe.form_dict.name or frappe.form_dict.new)
and (frappe.session.user!="Guest" or not self.login_required))
if context.success_message:
context.success_message = context.success_message.replace("\n",
"<br>").replace("'", "\'")
@ -165,7 +171,6 @@ def get_context(context):
module = scrub(self.module),
name = scrub(self.name)
)
print module_name
module = frappe.get_module(module_name)
new_context = module.get_context(context)