From d44e29bc70cbcfe03871eef2168da998847ad977 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 24 Oct 2019 13:03:56 +0530 Subject: [PATCH] refactor: use props --- frappe/public/js/frappe/file_uploader/FileUploader.vue | 6 +++--- frappe/public/js/frappe/form/controls/attach.js | 1 - frappe/public/js/frappe/web_form/webform_script.js | 5 +++++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/frappe/public/js/frappe/file_uploader/FileUploader.vue b/frappe/public/js/frappe/file_uploader/FileUploader.vue index e79b926093..fe971dbf4c 100644 --- a/frappe/public/js/frappe/file_uploader/FileUploader.vue +++ b/frappe/public/js/frappe/file_uploader/FileUploader.vue @@ -129,6 +129,9 @@ export default { show_upload_button: { default: true }, + file_browser_enabled: { + default: true + }, allow_multiple: { default: true }, @@ -187,9 +190,6 @@ export default { return this.files.length > 0 && this.files.every( file => file.total !== 0 && file.progress === file.total); - }, - file_browser_enabled() { - return !Boolean(frappe.web_form) } }, methods: { diff --git a/frappe/public/js/frappe/form/controls/attach.js b/frappe/public/js/frappe/form/controls/attach.js index a34c57b38f..15cbd3b043 100644 --- a/frappe/public/js/frappe/form/controls/attach.js +++ b/frappe/public/js/frappe/form/controls/attach.js @@ -71,7 +71,6 @@ frappe.ui.form.ControlAttach = frappe.ui.form.ControlData.extend({ if (this.df.options) { Object.assign(options, this.df.options); } - this.upload_options = options; }, diff --git a/frappe/public/js/frappe/web_form/webform_script.js b/frappe/public/js/frappe/web_form/webform_script.js index c0cead175d..4fe0a8150e 100644 --- a/frappe/public/js/frappe/web_form/webform_script.js +++ b/frappe/public/js/frappe/web_form/webform_script.js @@ -111,6 +111,11 @@ frappe.ready(function() { if (df.fieldtype === "Link") { df.only_select = true; } + if (["Attach", "Attach Image"].includes(df.fieldtype)) { + if (!df.options) + df.options = {} + df.options.file_browser_enabled = false; + } }); return form_data;