From c15ba6ccf8fa4f35f26c57b9c2a9432f31914d68 Mon Sep 17 00:00:00 2001 From: Sujith Haridasan Date: Wed, 7 Sep 2016 18:47:52 +0530 Subject: [PATCH] Choose button remains disbaled for httpd/unix-directory This is not correct. Hence in this patch we validate if the mimetype is 'httpd/unix-directory'. If so we don't disable it. This patch addresses solution for issue: 26034 Signed-off-by: Sujith Haridasan --- core/js/oc-dialogs.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index 75c8ef9020..bdee8a1bb0 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -821,7 +821,11 @@ var OCdialogs = { self._fillFilePicker(dir); var getOcDialog = this.closest('.oc-dialog'); var buttonEnableDisable = $('.primary', getOcDialog); - buttonEnableDisable.prop("disabled", true); + if (this.$filePicker.data('mimetype') === "http/unix-directory") { + buttonEnableDisable.prop("disabled", false); + } else { + buttonEnableDisable.prop("disabled", true); + } }, /** * handle clicks made in the filepicker @@ -837,7 +841,11 @@ var OCdialogs = { buttonEnableDisable.prop("disabled", false); } else if ( $element.data('type') === 'dir' ) { this._fillFilePicker(this.$filePicker.data('path') + '/' + $element.data('entryname')); - buttonEnableDisable.prop("disabled", true); + if (this.$filePicker.data('mimetype') === "httpd/unix-directory") { + buttonEnableDisable.prop("disabled", false); + } else { + buttonEnableDisable.prop("disabled", true); + } } } };