Added support for custom breadcrumbs
This commit is contained in:
parent
e247cc82d9
commit
01f1ca17a4
3 changed files with 8 additions and 4 deletions
|
|
@ -361,6 +361,7 @@ class BaseDocument(object):
|
|||
def _get_missing_mandatory_fields(self):
|
||||
"""Get mandatory fields that do not have any values"""
|
||||
def get_msg(df):
|
||||
print df
|
||||
if df.fieldtype == "Table":
|
||||
return "{}: {}: {}".format(_("Error"), _("Data missing in table"), _(df.label))
|
||||
|
||||
|
|
|
|||
|
|
@ -56,7 +56,10 @@
|
|||
{{ field.read_only and "disabled" or "" }}
|
||||
{% endmacro -%}
|
||||
|
||||
{%- macro value(field) -%}{% if doc %}{{ doc.get(field.fieldname) or field.default or "" }}{% else %}{{ getCookie(field.options) or field.default or "" }}{% endif %}{%- endmacro -%}
|
||||
{%- macro value(field) -%}{% if doc %}{{
|
||||
doc.get(field.fieldname) or
|
||||
field.default or
|
||||
frappe.form_dict.get(field.fieldname) or "" }}{% else %}{{ getCookie(field.options) or field.default or "" }}{% endif %}{%- endmacro -%}
|
||||
|
||||
{%- macro help(field) -%}
|
||||
{% if field.description -%}
|
||||
|
|
|
|||
|
|
@ -134,10 +134,10 @@ class WebForm(WebsiteGenerator):
|
|||
|
||||
def get_parents(self, context):
|
||||
parents = None
|
||||
if context.parents:
|
||||
parents = context.parents
|
||||
elif self.breadcrumbs:
|
||||
if self.breadcrumbs:
|
||||
parents = json.loads(self.breadcrumbs)
|
||||
elif context.parents:
|
||||
parents = context.parents
|
||||
elif context.is_list:
|
||||
parents = [{"title": _("My Account"), "name": "me"}]
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue