From 3b2c385d2b5d70725fbb5a8b86237520e5cfafa2 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Fri, 7 Jun 2019 12:34:10 +0530 Subject: [PATCH] style: linting fixes --- frappe/public/js/frappe/form/controls/link.js | 1 - frappe/public/js/frappe/form/controls/table.js | 2 +- frappe/public/js/frappe/form/grid.js | 4 ++-- frappe/public/js/frappe/web_form/web_form_class.js | 4 ++-- frappe/website/render.py | 1 - frappe/www/list.py | 1 - 6 files changed, 5 insertions(+), 8 deletions(-) diff --git a/frappe/public/js/frappe/form/controls/link.js b/frappe/public/js/frappe/form/controls/link.js index 1ecf968e78..76d8411430 100644 --- a/frappe/public/js/frappe/form/controls/link.js +++ b/frappe/public/js/frappe/form/controls/link.js @@ -57,7 +57,6 @@ frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({ else { return frappe.get_route && frappe.get_route()[0] === 'List' ? frappe.get_route()[1] : null; } - return ''; }, setup_buttons: function() { if(this.only_input && !this.with_link_btn) { diff --git a/frappe/public/js/frappe/form/controls/table.js b/frappe/public/js/frappe/form/controls/table.js index 4a18bfcda0..5fad73364d 100644 --- a/frappe/public/js/frappe/form/controls/table.js +++ b/frappe/public/js/frappe/form/controls/table.js @@ -87,7 +87,7 @@ frappe.ui.form.ControlTable = frappe.ui.form.Control.extend({ }); frappe.hide_progress(); return false; // Prevent the default handler from running. - }) + }); }, refresh_input: function() { this.grid.refresh(); diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js index 17956f6526..72e6f1ae98 100644 --- a/frappe/public/js/frappe/form/grid.js +++ b/frappe/public/js/frappe/form/grid.js @@ -139,7 +139,7 @@ export default class Grid { me.get_selected_children().forEach((doc) => { tasks.push(() => { if (!me.frm) { - me.df.data = me.get_data() + me.df.data = me.get_data(); me.df.data = me.df.data.filter((row)=> row.idx != doc.idx); } me.grid_rows_by_docname[doc.name].remove(); @@ -780,4 +780,4 @@ export default class Grid { // hide all custom buttons this.grid_buttons.find('.btn-custom').addClass('hidden'); } -}; \ No newline at end of file +} \ No newline at end of file diff --git a/frappe/public/js/frappe/web_form/web_form_class.js b/frappe/public/js/frappe/web_form/web_form_class.js index 9411a69f45..5a53744412 100644 --- a/frappe/public/js/frappe/web_form/web_form_class.js +++ b/frappe/public/js/frappe/web_form/web_form_class.js @@ -23,7 +23,7 @@ frappe.ui.WebForm = class WebForm extends frappe.ui.FieldGroup { } on(fieldname, handler) { - let field = web_form.fields_dict[fieldname]; + let field = this.fields_dict[fieldname]; field.input.addEventListener("focus", () => handler(field, field.value) ); @@ -48,7 +48,7 @@ frappe.ui.WebForm = class WebForm extends frappe.ui.FieldGroup { } setup_primary_action() { - this.add_button(web_form.button_label || "Save", "primary", () => + this.add_button(this.button_label || "Save", "primary", () => this.save(this.accept_payment && !this.doc.paid) ); } diff --git a/frappe/website/render.py b/frappe/website/render.py index ffc1dd900e..5d7d05ff53 100644 --- a/frappe/website/render.py +++ b/frappe/website/render.py @@ -107,7 +107,6 @@ def is_web_form(path): return bool(frappe.get_all("Web Form", filters={'route': path})) def render_web_form(path): - web_form_name = frappe.get_all("Web Form", filters={'route': path})[0].name data = render_page(path) return data diff --git a/frappe/www/list.py b/frappe/www/list.py index eeb0d1ac83..e4c3ab0133 100644 --- a/frappe/www/list.py +++ b/frappe/www/list.py @@ -116,7 +116,6 @@ def set_route(context): quoted(context.doc.name)) def prepare_filters(doctype, controller, kwargs): - import json for key in kwargs.keys(): try: kwargs[key] = json.loads(kwargs[key])