diff --git a/frappe/public/js/frappe/file_uploader/FileUploader.vue b/frappe/public/js/frappe/file_uploader/FileUploader.vue
index ae7f428327..dbbde40f2a 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(', ')"
>
- {{ __('choose an') }}
-
- {{ __('uploaded file') }}
-
+
+ {{ __('choose an') }}
+
+ {{ __('uploaded file') }}
+
+
{{ __('or attach a') }}
0
&& this.files.every(
file => file.total !== 0 && file.progress === file.total);
- },
+ }
},
methods: {
dragover() {
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/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..faae88fce6 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.disable_file_browser = true;
+ }
});
return form_data;