From ab7c268fce211847f3b7cd6b6867e17dcd0efe77 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 24 Oct 2019 12:40:29 +0530
Subject: [PATCH 1/4] fix: hide file browser for web forms

---
 .../js/frappe/file_uploader/FileUploader.vue  | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/frappe/public/js/frappe/file_uploader/FileUploader.vue b/frappe/public/js/frappe/file_uploader/FileUploader.vue
index ae7f428327..e79b926093 100644
--- a/frappe/public/js/frappe/file_uploader/FileUploader.vue
+++ b/frappe/public/js/frappe/file_uploader/FileUploader.vue
@@ -23,12 +23,14 @@
 							:accept="restrictions.allowed_file_types.join(', ')"
 						>
 					</label>
-					{{ __('choose an') }}
-					<a href="#" class="text-primary bold"
-						@click.stop.prevent="show_file_browser = true"
-					>
-						{{ __('uploaded file') }}
-					</a>
+					<span v-if="file_browser_enabled">
+						{{ __('choose an') }}
+						<a href="#" class="text-primary bold"
+							@click.stop.prevent="show_file_browser = true"
+						>
+							{{ __('uploaded file') }}
+						</a>
+					</span>
 					{{ __('or attach a') }}
 					<a class="text-primary bold" href
 						@click.stop.prevent="show_web_link = true"
@@ -105,7 +107,7 @@
 		</div>
 		<FileBrowser
 			ref="file_browser"
-			v-if="show_file_browser"
+			v-if="show_file_browser && file_browser_enabled"
 			@hide-browser="show_file_browser = false"
 		/>
 		<WebLink
@@ -186,6 +188,9 @@ export default {
 				&& this.files.every(
 					file => file.total !== 0 && file.progress === file.total);
 		},
+		file_browser_enabled() {
+			return !Boolean(frappe.web_form)
+		}
 	},
 	methods: {
 		dragover() {

From d44e29bc70cbcfe03871eef2168da998847ad977 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 24 Oct 2019 13:03:56 +0530
Subject: [PATCH 2/4] 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;

From 28e932130493d0556cf334f61213a6a5d2d77606 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 24 Oct 2019 13:49:09 +0530
Subject: [PATCH 3/4] refactor: added prop to index.js

---
 frappe/public/js/frappe/file_uploader/FileUploader.vue | 8 ++++----
 frappe/public/js/frappe/file_uploader/index.js         | 6 ++++--
 frappe/public/js/frappe/web_form/webform_script.js     | 2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/frappe/public/js/frappe/file_uploader/FileUploader.vue b/frappe/public/js/frappe/file_uploader/FileUploader.vue
index fe971dbf4c..dbbde40f2a 100644
--- a/frappe/public/js/frappe/file_uploader/FileUploader.vue
+++ b/frappe/public/js/frappe/file_uploader/FileUploader.vue
@@ -23,7 +23,7 @@
 							:accept="restrictions.allowed_file_types.join(', ')"
 						>
 					</label>
-					<span v-if="file_browser_enabled">
+					<span v-if="!disable_file_browser">
 						{{ __('choose an') }}
 						<a href="#" class="text-primary bold"
 							@click.stop.prevent="show_file_browser = true"
@@ -107,7 +107,7 @@
 		</div>
 		<FileBrowser
 			ref="file_browser"
-			v-if="show_file_browser && file_browser_enabled"
+			v-if="show_file_browser && !disable_file_browser"
 			@hide-browser="show_file_browser = false"
 		/>
 		<WebLink
@@ -129,8 +129,8 @@ export default {
 		show_upload_button: {
 			default: true
 		},
-		file_browser_enabled: {
-			default: true
+		disable_file_browser: {
+			default: false
 		},
 		allow_multiple: {
 			default: true
diff --git a/frappe/public/js/frappe/file_uploader/index.js b/frappe/public/js/frappe/file_uploader/index.js
index e08b952c6f..f81a1f1776 100644
--- a/frappe/public/js/frappe/file_uploader/index.js
+++ b/frappe/public/js/frappe/file_uploader/index.js
@@ -12,7 +12,8 @@ export default class FileUploader {
 		restrictions,
 		upload_notes,
 		allow_multiple,
-		as_dataurl
+		as_dataurl,
+		disable_file_browser,
 	} = {}) {
 		if (!wrapper) {
 			this.make_dialog();
@@ -33,7 +34,8 @@ export default class FileUploader {
 					restrictions,
 					upload_notes,
 					allow_multiple,
-					as_dataurl
+					as_dataurl,
+					disable_file_browser,
 				}
 			})
 		});
diff --git a/frappe/public/js/frappe/web_form/webform_script.js b/frappe/public/js/frappe/web_form/webform_script.js
index 4fe0a8150e..854032fe0c 100644
--- a/frappe/public/js/frappe/web_form/webform_script.js
+++ b/frappe/public/js/frappe/web_form/webform_script.js
@@ -114,7 +114,7 @@ frappe.ready(function() {
 				if (["Attach", "Attach Image"].includes(df.fieldtype)) {
 					if (!df.options)
 						df.options = {}
-					df.options.file_browser_enabled = false;
+					df.options.disable_file_browser = true;
 				}
 			});
 

From d73ded3217f1097bec0168e54340058009cc45f3 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scmmishra@users.noreply.github.com>
Date: Thu, 24 Oct 2019 16:24:06 +0530
Subject: [PATCH 4/4] Update webform_script.js

---
 frappe/public/js/frappe/web_form/webform_script.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/web_form/webform_script.js b/frappe/public/js/frappe/web_form/webform_script.js
index 854032fe0c..faae88fce6 100644
--- a/frappe/public/js/frappe/web_form/webform_script.js
+++ b/frappe/public/js/frappe/web_form/webform_script.js
@@ -113,7 +113,7 @@ frappe.ready(function() {
 				}
 				if (["Attach", "Attach Image"].includes(df.fieldtype)) {
 					if (!df.options)
-						df.options = {}
+						df.options = {};
 					df.options.disable_file_browser = true;
 				}
 			});