${value}
{{ _(title) }}
+ {% else %} +
+ ${__("login_required")}
+
`;
+ let message = __(
+ "Login is required to see web form list view. Enable {0} to see list settings",
+ [go_to_login_required_field]
+ );
$(frm.fields_dict["list_setting_message"].wrapper)
- .html(
- $(
- ``
- )
- )
- .find("span")
+ .html($(``))
+ .find("code")
.click(() => frm.scroll_to_field("login_required"));
} else {
$(frm.fields_dict["list_setting_message"].wrapper).empty();
diff --git a/frappe/website/doctype/web_form/web_form.json b/frappe/website/doctype/web_form/web_form.json
index 8faa263e5b..f5ab147c64 100644
--- a/frappe/website/doctype/web_form/web_form.json
+++ b/frappe/website/doctype/web_form/web_form.json
@@ -5,50 +5,50 @@
"document_type": "Document",
"engine": "InnoDB",
"field_order": [
- "title_and_route_tab",
+ "form_tab",
"title",
"route",
"published",
- "column_break_4",
+ "column_break_1",
"doc_type",
"module",
"is_standard",
- "introduction",
+ "section_break_1",
"introduction_text",
- "form_settings_tab",
+ "web_form_fields",
+ "settings_tab",
"login_required",
"allow_multiple",
"allow_edit",
"allow_delete",
- "column_break_18",
+ "column_break_2",
"apply_document_permissions",
"allow_print",
"print_format",
"allow_comments",
"show_attachments",
"allow_incomplete",
- "form_fields",
- "web_form_fields",
+ "section_break_2",
"max_attachment_size",
- "list_settings_tab",
+ "section_break_3",
"list_setting_message",
"show_list",
"list_title",
"list_columns",
- "sidebar_settings_tab",
+ "section_break_4",
"show_sidebar",
"website_sidebar",
"customization_tab",
"button_label",
"banner_image",
- "column_break_37",
+ "column_break_3",
"breadcrumbs",
- "section_break_43",
+ "section_break_5",
"success_title",
"success_url",
- "column_break_41",
+ "column_break_4",
"success_message",
- "scripting_style_tab",
+ "section_break_6",
"client_script",
"custom_css"
],
@@ -81,10 +81,6 @@
"label": "Module",
"options": "Module Def"
},
- {
- "fieldname": "column_break_4",
- "fieldtype": "Column Break"
- },
{
"default": "0",
"fieldname": "is_standard",
@@ -158,12 +154,6 @@
"fieldtype": "Check",
"label": "Allow Incomplete Forms"
},
- {
- "collapsible": 1,
- "fieldname": "introduction",
- "fieldtype": "Section Break",
- "label": "Introduction"
- },
{
"fieldname": "introduction_text",
"fieldtype": "Text Editor",
@@ -250,21 +240,6 @@
"label": "List Columns",
"options": "Web Form List Column"
},
- {
- "fieldname": "title_and_route_tab",
- "fieldtype": "Tab Break",
- "label": "Title & Route"
- },
- {
- "collapsible": 1,
- "fieldname": "form_fields",
- "fieldtype": "Section Break",
- "label": "Form Fields"
- },
- {
- "fieldname": "column_break_18",
- "fieldtype": "Column Break"
- },
{
"fieldname": "website_sidebar",
"fieldtype": "Link",
@@ -276,29 +251,6 @@
"fieldtype": "HTML",
"label": "List Setting Message"
},
- {
- "fieldname": "form_settings_tab",
- "fieldtype": "Tab Break",
- "label": "Form Settings"
- },
- {
- "collapsible": 1,
- "collapsible_depends_on": "show_list",
- "fieldname": "list_settings_tab",
- "fieldtype": "Tab Break",
- "label": "List Settings"
- },
- {
- "collapsible": 1,
- "fieldname": "sidebar_settings_tab",
- "fieldtype": "Tab Break",
- "label": "Sidebar Settings"
- },
- {
- "fieldname": "scripting_style_tab",
- "fieldtype": "Tab Break",
- "label": "Scripting / Style"
- },
{
"fieldname": "customization_tab",
"fieldtype": "Tab Break",
@@ -315,24 +267,74 @@
"label": "Banner Image"
},
{
- "fieldname": "column_break_41",
+ "fieldname": "form_tab",
+ "fieldtype": "Tab Break",
+ "label": "Form"
+ },
+ {
+ "fieldname": "column_break_1",
"fieldtype": "Column Break"
},
{
- "fieldname": "section_break_43",
+ "fieldname": "section_break_1",
+ "fieldtype": "Section Break"
+ },
+ {
+ "fieldname": "settings_tab",
+ "fieldtype": "Tab Break",
+ "label": "Settings"
+ },
+ {
+ "fieldname": "column_break_2",
+ "fieldtype": "Column Break"
+ },
+ {
+ "collapsible": 1,
+ "fieldname": "section_break_2",
+ "fieldtype": "Section Break"
+ },
+ {
+ "collapsible": 1,
+ "collapsible_depends_on": "show_list",
+ "fieldname": "section_break_3",
+ "fieldtype": "Section Break",
+ "label": "List Settings"
+ },
+ {
+ "collapsible": 1,
+ "collapsible_depends_on": "show_sidebar",
+ "fieldname": "section_break_4",
+ "fieldtype": "Section Break",
+ "label": "Sidebar Settings"
+ },
+ {
+ "fieldname": "column_break_3",
+ "fieldtype": "Column Break"
+ },
+ {
+ "collapsible": 1,
+ "collapsible_depends_on": "eval: doc.success_title || doc.success_message || doc.success_url",
+ "fieldname": "section_break_5",
"fieldtype": "Section Break",
"label": "After Submission"
},
{
- "fieldname": "column_break_37",
+ "fieldname": "column_break_4",
"fieldtype": "Column Break"
+ },
+ {
+ "collapsible": 1,
+ "collapsible_depends_on": "eval: doc.client_script || doc.custom_css",
+ "fieldname": "section_break_6",
+ "fieldtype": "Section Break",
+ "label": "Scripting / Style"
}
],
"has_web_view": 1,
"icon": "icon-edit",
"is_published_field": "published",
"links": [],
- "modified": "2022-08-11 16:27:25.914627",
+ "modified": "2022-08-17 18:58:49.451658",
"modified_by": "Administrator",
"module": "Website",
"name": "Web Form",
diff --git a/frappe/website/doctype/web_form/web_form.py b/frappe/website/doctype/web_form/web_form.py
index 718088212f..e0ae91fef7 100644
--- a/frappe/website/doctype/web_form/web_form.py
+++ b/frappe/website/doctype/web_form/web_form.py
@@ -8,7 +8,6 @@ import frappe
from frappe import _, scrub
from frappe.core.api.file import get_max_file_size
from frappe.core.doctype.file import remove_file_by_url
-from frappe.custom.doctype.customize_form.customize_form import docfield_properties
from frappe.desk.form.meta import get_code_files_via_hooks
from frappe.modules.utils import export_module_json, get_doc_module
from frappe.rate_limiter import rate_limit
@@ -22,8 +21,6 @@ class WebForm(WebsiteGenerator):
def onload(self):
super().onload()
- if self.is_standard and not frappe.conf.developer_mode:
- self.use_meta_fields()
def validate(self):
super().validate()
@@ -67,31 +64,6 @@ class WebForm(WebsiteGenerator):
for df in self.web_form_fields:
df.parent = self.doc_type
- def use_meta_fields(self):
- """Override default properties for standard web forms"""
- meta = frappe.get_meta(self.doc_type)
-
- for df in self.web_form_fields:
- meta_df = meta.get_field(df.fieldname)
-
- if not meta_df:
- continue
-
- for prop in docfield_properties:
- if df.fieldtype == meta_df.fieldtype and prop not in (
- "idx",
- "reqd",
- "default",
- "description",
- "options",
- "hidden",
- "read_only",
- "label",
- ):
- df.set(prop, meta_df.get(prop))
-
- # TODO translate options of Select fields like Country
-
# export
def on_update(self):
"""
@@ -124,7 +96,8 @@ def get_context(context):
def get_context(self, context):
"""Build context to render the `web_form.html` template"""
- context.is_form_editable = False
+ context.in_edit_mode = False
+ context.in_view_mode = False
self.set_web_form_module()
if frappe.form_dict.is_list:
@@ -156,10 +129,14 @@ def get_context(context):
frappe.redirect(f"/{self.route}/new")
if frappe.form_dict.is_edit and not self.allow_edit:
+ context.in_view_mode = True
frappe.redirect(f"/{self.route}/{frappe.form_dict.name}")
if frappe.form_dict.is_edit:
- context.is_form_editable = True
+ context.in_edit_mode = True
+
+ if frappe.form_dict.is_read:
+ context.in_view_mode = True
if (
not frappe.form_dict.is_edit
@@ -167,7 +144,7 @@ def get_context(context):
and self.allow_edit
and frappe.form_dict.name
):
- context.is_form_editable = True
+ context.in_edit_mode = True
frappe.redirect(f"/{frappe.local.path}/edit")
if (
@@ -179,6 +156,7 @@ def get_context(context):
):
name = frappe.db.get_value(self.doc_type, {"owner": frappe.session.user}, "name")
if name:
+ context.in_view_mode = True
frappe.redirect(f"/{self.route}/{name}")
# Show new form when
@@ -190,9 +168,6 @@ def get_context(context):
self.reset_field_parent()
- if self.is_standard:
- self.use_meta_fields()
-
# add keys from form_dict to context
context.update(dict_with_keys(frappe.form_dict, ["is_list", "is_new", "is_edit", "is_read"]))
@@ -203,7 +178,9 @@ def get_context(context):
# load web form doc
context.web_form_doc = self.as_dict(no_nulls=True)
- context.web_form_doc.update(dict_with_keys(context, ["is_list", "is_new", "is_form_editable"]))
+ context.web_form_doc.update(
+ dict_with_keys(context, ["is_list", "is_new", "in_edit_mode", "in_view_mode"])
+ )
if self.show_sidebar and self.website_sidebar:
context.sidebar_items = get_sidebar_items(self.website_sidebar)
@@ -278,17 +255,11 @@ def get_context(context):
if frappe.form_dict.name:
context.doc_name = frappe.form_dict.name
context.reference_doc = frappe.get_doc(self.doc_type, context.doc_name)
- context.title = strip_html(
- context.reference_doc.get(context.reference_doc.meta.get_title_field())
+ context.web_form_title = context.title
+ context.title = (
+ strip_html(context.reference_doc.get(context.reference_doc.meta.get_title_field()))
+ or context.doc_name
)
- if context.is_form_editable and context.parents:
- context.parents.append(
- {
- "label": _(context.title),
- "route": f"{self.route}/{context.doc_name}",
- }
- )
- context.title = _("Editing {0}").format(context.title)
context.reference_doc.add_seen()
context.reference_doctype = context.reference_doc.doctype
context.reference_name = context.reference_doc.name
@@ -309,7 +280,7 @@ def get_context(context):
context.reference_doc.doctype, context.reference_doc.name
)
- context.reference_doc = json.loads(context.reference_doc.as_json())
+ context.reference_doc = context.reference_doc.as_dict(no_nulls=True)
def add_custom_context_and_script(self, context):
"""Update context from module if standard and append script"""
@@ -341,62 +312,6 @@ def get_context(context):
context.style = style
- def get_layout(self):
- layout = []
-
- def add_page(df=None):
- new_page = {"sections": []}
- layout.append(new_page)
- if df and df.fieldtype == "Page Break":
- new_page.update(df.as_dict())
-
- return new_page
-
- def add_section(df=None):
- new_section = {"columns": []}
- if layout:
- layout[-1]["sections"].append(new_section)
- if df and df.fieldtype == "Section Break":
- new_section.update(df.as_dict())
-
- return new_section
-
- def add_column(df=None):
- new_col = []
- if layout:
- layout[-1]["sections"][-1]["columns"].append(new_col)
-
- return new_col
-
- page, section, column = None, None, None
- for df in self.web_form_fields:
-
- # breaks
- if df.fieldtype == "Page Break":
- page = add_page(df)
- section, column = None, None
-
- if df.fieldtype == "Section Break":
- section = add_section(df)
- column = None
-
- if df.fieldtype == "Column Break":
- column = add_column(df)
-
- # input
- if df.fieldtype not in ("Section Break", "Column Break", "Page Break"):
- if not page:
- page = add_page()
- section, column = None, None
- if not section:
- section = add_section()
- column = None
- if column is None:
- column = add_column()
- column.append(df)
-
- return layout
-
def get_parents(self, context):
parents = None
@@ -481,7 +396,7 @@ def accept(web_form, data, docname=None):
for field in web_form.web_form_fields:
fieldname = field.fieldname
df = meta.get_field(fieldname)
- value = data.get(fieldname, None)
+ value = data.get(fieldname, "")
if df and df.fieldtype in ("Attach", "Attach Image"):
if value and "data:" and "base64" in value:
@@ -597,17 +512,6 @@ def get_web_form_filters(web_form_name):
return [field for field in web_form.web_form_fields if field.show_in_filter]
-def make_route_string(parameters):
- route_string = ""
- delimeter = "?"
- if isinstance(parameters, dict):
- for key in parameters:
- if key != "web_form_name":
- route_string += route_string + delimeter + key + "=" + cstr(parameters[key])
- delimeter = "&"
- return (route_string, delimeter)
-
-
@frappe.whitelist(allow_guest=True)
def get_form_data(doctype, docname=None, web_form_name=None):
web_form = frappe.get_doc("Web Form", web_form_name)
diff --git a/frappe/website/doctype/web_form_field/web_form_field.json b/frappe/website/doctype/web_form_field/web_form_field.json
index dbadf52881..4fb566be88 100644
--- a/frappe/website/doctype/web_form_field/web_form_field.json
+++ b/frappe/website/doctype/web_form_field/web_form_field.json
@@ -32,20 +32,20 @@
"fieldname": "fieldname",
"fieldtype": "Select",
"in_list_view": 1,
- "label": "Fieldname"
+ "label": "Field"
},
{
"fieldname": "fieldtype",
"fieldtype": "Select",
"in_list_view": 1,
"label": "Fieldtype",
- "options": "Attach\nAttach Image\nCheck\nCurrency\nData\nDate\nDatetime\nDuration\nFloat\nHTML\nInt\nLink\nPassword\nRating\nSelect\nSignature\nSmall Text\nText\nText Editor\nTable\nTime\nSection Break\nColumn Break\nPage Break"
+ "options": "Attach\nAttach Image\nCheck\nCurrency\nColor\nData\nDate\nDatetime\nDuration\nFloat\nHTML\nInt\nLink\nPassword\nRating\nSelect\nSignature\nSmall Text\nText\nText Editor\nTable\nTime\nSection Break\nColumn Break\nPage Break"
},
{
"fieldname": "label",
"fieldtype": "Data",
"in_list_view": 1,
- "label": "Label"
+ "label": "Custom Label"
},
{
"default": "0",
@@ -58,6 +58,7 @@
"default": "0",
"fieldname": "reqd",
"fieldtype": "Check",
+ "in_list_view": 1,
"label": "Mandatory"
},
{
@@ -146,7 +147,7 @@
],
"istable": 1,
"links": [],
- "modified": "2022-08-10 12:59:51.170546",
+ "modified": "2022-08-22 17:22:39.026893",
"modified_by": "Administrator",
"module": "Website",
"name": "Web Form Field",
diff --git a/frappe/website/doctype/web_form_list_column/web_form_list_column.json b/frappe/website/doctype/web_form_list_column/web_form_list_column.json
index e55aeadca6..8be724f426 100644
--- a/frappe/website/doctype/web_form_list_column/web_form_list_column.json
+++ b/frappe/website/doctype/web_form_list_column/web_form_list_column.json
@@ -15,14 +15,14 @@
"fieldname": "fieldname",
"fieldtype": "Select",
"in_list_view": 1,
- "label": "Fieldname",
+ "label": "Field",
"reqd": 1
},
{
"fieldname": "label",
"fieldtype": "Data",
"in_list_view": 1,
- "label": "Label"
+ "label": "Custom Label"
},
{
"fieldname": "fieldtype",
@@ -35,7 +35,7 @@
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
- "modified": "2022-06-21 17:22:14.978947",
+ "modified": "2022-08-17 19:09:01.417841",
"modified_by": "Administrator",
"module": "Website",
"name": "Web Form List Column",
diff --git a/frappe/website/doctype/website_settings/test_website_settings.py b/frappe/website/doctype/website_settings/test_website_settings.py
index 1e8410fb6e..c95d380a34 100644
--- a/frappe/website/doctype/website_settings/test_website_settings.py
+++ b/frappe/website/doctype/website_settings/test_website_settings.py
@@ -1,8 +1,29 @@
# Copyright (c) 2020, Frappe Technologies and Contributors
# License: MIT. See LICENSE
-# import frappe
+
+import frappe
from frappe.tests.utils import FrappeTestCase
+from frappe.website.doctype.website_settings.website_settings import get_website_settings
class TestWebsiteSettings(FrappeTestCase):
- pass
+ def test_child_items_in_top_bar(self):
+ ws = frappe.get_doc("Website Settings")
+ ws.append(
+ "top_bar_items",
+ {"label": "Parent Item"},
+ )
+ ws.append(
+ "top_bar_items",
+ {"parent_label": "Parent Item", "label": "Child Item"},
+ )
+ ws.save()
+
+ context = get_website_settings()
+
+ for item in context.top_bar_items:
+ if item.label == "Parent Item":
+ self.assertEqual(item.child_items[0].label, "Child Item")
+ break
+ else:
+ self.fail("Child items not found")
diff --git a/frappe/website/doctype/website_settings/website_settings.py b/frappe/website/doctype/website_settings/website_settings.py
index be9b155314..744a3c90a3 100644
--- a/frappe/website/doctype/website_settings/website_settings.py
+++ b/frappe/website/doctype/website_settings/website_settings.py
@@ -218,7 +218,7 @@ def modify_header_footer_items(items: list):
continue
if not top_bar_item.get("child_items"):
- top_bar_item["child_items"] = []
+ top_bar_item.child_items = []
top_bar_item.child_items.append(item)
break