From f4efb7df0a9ca6f1621fdcb944bfb05d109e7900 Mon Sep 17 00:00:00 2001 From: scmmishra Date: Thu, 7 Feb 2019 11:21:23 +0530 Subject: [PATCH 01/10] [fix] Awesomeplete breaking on web forms - Added variables.less to awesomeplete - Added awesompelete to web_form.css in build.json --- frappe/public/build.json | 3 ++- frappe/public/less/awesomplete.less | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/public/build.json b/frappe/public/build.json index 9c395c9bca..32100cea80 100755 --- a/frappe/public/build.json +++ b/frappe/public/build.json @@ -381,7 +381,8 @@ "public/less/list.less", "website/css/web_form.css", "public/less/quill.less", - "public/less/datepicker.less" + "public/less/datepicker.less", + "public/less/awesomplete.less" ], "js/print_format_v3.min.js": [ "public/js/legacy/layout.js", diff --git a/frappe/public/less/awesomplete.less b/frappe/public/less/awesomplete.less index 1642e3171d..3a676f60d3 100644 --- a/frappe/public/less/awesomplete.less +++ b/frappe/public/less/awesomplete.less @@ -1,3 +1,4 @@ +@import "variables.less"; .awesomplete { display: inline-block; From d484ee2d1212b7ed2b02d8b3ac8e2b10cc1f1d64 Mon Sep 17 00:00:00 2001 From: scmmishra Date: Thu, 7 Feb 2019 11:55:38 +0530 Subject: [PATCH 02/10] fix: button alignment on web-form --- frappe/website/doctype/web_form/templates/web_form.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/website/doctype/web_form/templates/web_form.html b/frappe/website/doctype/web_form/templates/web_form.html index abf4f228aa..357f78205f 100644 --- a/frappe/website/doctype/web_form/templates/web_form.html +++ b/frappe/website/doctype/web_form/templates/web_form.html @@ -27,7 +27,7 @@ {% endif %} {% if is_list %} -
+
{{ _("New") }} From 8ea272601f2adb0a3dddb0ea691d0b255ed2a044 Mon Sep 17 00:00:00 2001 From: scmmishra Date: Thu, 7 Feb 2019 12:19:15 +0530 Subject: [PATCH 03/10] fix: Added from_grid.less to web_form --- frappe/public/build.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/public/build.json b/frappe/public/build.json index 32100cea80..f133e4742b 100755 --- a/frappe/public/build.json +++ b/frappe/public/build.json @@ -382,7 +382,8 @@ "website/css/web_form.css", "public/less/quill.less", "public/less/datepicker.less", - "public/less/awesomplete.less" + "public/less/awesomplete.less", + "public/less/form_grid.less" ], "js/print_format_v3.min.js": [ "public/js/legacy/layout.js", From 53b97e0fd564b1b4183e6d1eea9b8aed3f82169a Mon Sep 17 00:00:00 2001 From: scmmishra Date: Mon, 11 Feb 2019 12:52:54 +0530 Subject: [PATCH 04/10] fix (web-form): In form grid --- frappe/public/js/frappe/form/grid.js | 48 ++++++++++++++-------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js index 3255b0fb4a..d283a0ad3d 100644 --- a/frappe/public/js/frappe/form/grid.js +++ b/frappe/public/js/frappe/form/grid.js @@ -59,30 +59,30 @@ export default class Grid {
${__("No Data")}
-
-
-
- - -
-
- - ${__("Download")} - - ${__("Upload")} -
-
+
+
+
+
+
+ + +
+
+ + ${__("Download")} + + ${__("Upload")}
From fa4f88db07c643c0f1342924dd7e1a220aad1cbc Mon Sep 17 00:00:00 2001 From: scmmishra Date: Tue, 12 Feb 2019 11:52:20 +0530 Subject: [PATCH 05/10] fix (web form): Fixed link to doc form in form grid --- frappe/website/js/grid_list.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/website/js/grid_list.js b/frappe/website/js/grid_list.js index 5c8e3c363c..dd93178314 100644 --- a/frappe/website/js/grid_list.js +++ b/frappe/website/js/grid_list.js @@ -51,7 +51,7 @@ export default function make_datatable(container, doctype) { .css({cursor: 'pointer'}) .click((e) => { if ($(e.target).is('[type=checkbox]')) return - window.location.href = window.location.href + '?name=' + data[i].name; + window.location.href = window.location.origin + window.location.pathname + '?name=' + data[i].name; }); for (let fieldname of colnames) { let val = data[i][fieldname]; From d97352c7ad2d29656ad104e7073c4b7f39a8b78f Mon Sep 17 00:00:00 2001 From: scmmishra Date: Tue, 12 Feb 2019 13:05:49 +0530 Subject: [PATCH 06/10] fix (webform): Fixed filters in web_from frid view --- frappe/website/js/grid_list.js | 11 +++++------ frappe/www/list.py | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/frappe/website/js/grid_list.js b/frappe/website/js/grid_list.js index dd93178314..80ca2850a4 100644 --- a/frappe/website/js/grid_list.js +++ b/frappe/website/js/grid_list.js @@ -116,14 +116,13 @@ export default function make_datatable(container, doctype) { args: { doctype }, callback: (r) => { const docfields = r.message; - + var data = frappe.utils.get_query_params() + data.doctype = doctype + data.fields = docfields.map(df => df.fieldname) + data.web_form_name = window.web_form_settings.web_form_name frappe.call({ method: 'frappe.www.list.get_list_data', - args: { - doctype, - fields: docfields.map(df => df.fieldname), - web_form_name: window.web_form_settings.web_form_name - }, + args: data, callback: (r) => { const data = r.message || []; make_table(docfields, data); diff --git a/frappe/www/list.py b/frappe/www/list.py index e0d8bd895a..416a2446ce 100644 --- a/frappe/www/list.py +++ b/frappe/www/list.py @@ -70,7 +70,7 @@ def get(doctype, txt=None, limit_start=0, limit=20, pathname=None, **kwargs): } @frappe.whitelist(allow_guest=True) -def get_list_data(doctype, txt=None, limit_start=0, limit=20, **kwargs): +def get_list_data(doctype, txt=None, limit_start=0, fields=None, cmd=None, limit=20, **kwargs): """Returns processed HTML page for a standard listing.""" limit_start = cint(limit_start) From f69adb43144565957a27f5756e9dbad9d7abc9be Mon Sep 17 00:00:00 2001 From: scmmishra Date: Thu, 14 Feb 2019 12:46:14 +0530 Subject: [PATCH 07/10] style: Fixed button placement in web form page --- frappe/website/doctype/web_form/templates/web_form.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/website/doctype/web_form/templates/web_form.html b/frappe/website/doctype/web_form/templates/web_form.html index 357f78205f..4ec2fbfa1f 100644 --- a/frappe/website/doctype/web_form/templates/web_form.html +++ b/frappe/website/doctype/web_form/templates/web_form.html @@ -3,7 +3,7 @@ {% block title %}{{ _(title) }}{% endblock %} {% block header %} -

{{ _(title) }}

+

{{ _(title) }}

{% endblock %} @@ -27,11 +27,11 @@
{% endif %} {% if is_list %} -
- +
+ {{ _("New") }} -
From 0f737d7834e3176ccae89fd1f06e0f7816b9bc13 Mon Sep 17 00:00:00 2001 From: scmmishra Date: Thu, 14 Feb 2019 13:22:29 +0530 Subject: [PATCH 08/10] fix: Minor css fix --- .../doctype/web_form/templates/web_form.html | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/frappe/website/doctype/web_form/templates/web_form.html b/frappe/website/doctype/web_form/templates/web_form.html index 4ec2fbfa1f..d2b5679198 100644 --- a/frappe/website/doctype/web_form/templates/web_form.html +++ b/frappe/website/doctype/web_form/templates/web_form.html @@ -46,12 +46,14 @@ {% endblock %} {% block page_content %} -
- {% if introduction_text %} -

{{ _(introduction_text) }}

- {% endif %} -
- +{% if introduction_text %} +
+

{{ _(introduction_text) }}

+
+{% else %} +
+{% endif %} +
{% if _login_required %}