From 2d26f3bcf545e9e4cd84dcd4ea25a526fc12f700 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Fri, 16 Aug 2019 16:32:53 +0530 Subject: [PATCH] refactor: enabled primary action in footer --- frappe/public/js/frappe/web_form/web_form.js | 24 ++++++++++++++----- .../doctype/web_form/templates/web_form.html | 4 +++- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/frappe/public/js/frappe/web_form/web_form.js b/frappe/public/js/frappe/web_form/web_form.js index 128d67cf4c..a1658f35c5 100644 --- a/frappe/public/js/frappe/web_form/web_form.js +++ b/frappe/public/js/frappe/web_form/web_form.js @@ -55,30 +55,42 @@ export default class WebForm extends frappe.ui.FieldGroup { intro_wrapper.innerHTML = intro; } - add_button(name, type, action) { + add_button(name, type, action, wrapper_class) { const button = document.createElement("button"); button.classList.add("btn", "btn-" + type, "btn-sm", "ml-2"); button.innerHTML = name; button.onclick = action; - document.querySelector(".web-form-actions").appendChild(button); + document.querySelector(wrapper_class).appendChild(button); + } + + add_button_to_footer(name, type, action) { + this.add_button(name, type, action, '.web-form-footer') + } + + add_button_to_header(name, type, action) { + this.add_button(name, type, action, '.web-form-actions') } setup_primary_action() { - this.add_button(this.button_label || "Save", "primary", () => + this.add_button_to_header(this.button_label || "Save", "primary", () => + this.save() + ); + + this.add_button_to_footer(this.button_label || "Save", "primary", () => this.save() ); } setup_cancel_button() { - this.add_button("Cancel", "light", () => this.cancel()); + this.add_button_to_header("Cancel", "light", () => this.cancel()); } setup_delete_button() { - this.add_button("Delete", "danger", () => this.delete()); + this.add_button_to_header("Delete", "danger", () => this.delete()); } setup_print_button() { - this.add_button( + this.add_button_to_header( '', "light", () => this.print() diff --git a/frappe/website/doctype/web_form/templates/web_form.html b/frappe/website/doctype/web_form/templates/web_form.html index eb16f24fa1..f614a7ecb6 100644 --- a/frappe/website/doctype/web_form/templates/web_form.html +++ b/frappe/website/doctype/web_form/templates/web_form.html @@ -25,7 +25,7 @@ data-web-form="{{ name }}" data-web-form-doctype="{{ doc_type }}" data-login-req {% endmacro %} {% block page_content %} -
+
{% if is_list %} {# web form list #}
@@ -36,6 +36,8 @@ data-web-form="{{ name }}" data-web-form-doctype="{{ doc_type }}" data-login-req

+
+
{% if show_attachments and not frappe.form_dict.new and attachments %}