Skip to content

Let users pick folders on projects #16829

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 2 commits into from
Aug 22, 2019
Merged

Let users pick folders on projects #16829

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5352b9
filepicker: Add option to also choose folders without a mimetype limit
juliusknorr Aug 21, 2019
09efc4d
Properly handle failures and allow choosing folders for projects
juliusknorr Aug 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
filepicker: Add option to also choose folders without a mimetype limit 
Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr
juliusknorr committed Aug 21, 2019
commit f5352b9c6738e22f94115ffe6afdd0a792cc6834
12 changes: 8 additions & 4 deletions core/src/OC/dialogs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,9 @@ const Dialogs = {
* @param modal make the dialog modal
* @param type Type of file picker : Choose, copy, move, copy and move
* @param path path to the folder that the the file can be picket from
* @param options additonal options that need to be set
*/
filepicker: function (title, callback, multiselect, mimetypeFilter, modal, type, path) {
filepicker: function (title, callback, multiselect, mimetypeFilter, modal, type, path, options) {
var self = this;

this.filepicker.sortField = 'name';
Expand All @@ -221,6 +222,9 @@ const Dialogs = {

this.filelist = null;
path = path || '';
options = Object.assign({
allowDirectoryChooser: false
}, options)

$.when(this._getFilePickerTemplate()).then(function ($tmpl) {
self.filepicker.loading = false;
Expand All @@ -244,7 +248,7 @@ const Dialogs = {
nameCol: t('core', 'Name'),
sizeCol: t('core', 'Size'),
modifiedCol: t('core', 'Modified')
}).data('path', path).data('multiselect', multiselect).data('mimetype', mimetypeFilter);
}).data('path', path).data('multiselect', multiselect).data('mimetype', mimetypeFilter).data('allowDirectoryChooser', options.allowDirectoryChooser)

if (modal === undefined) {
modal = false;
Expand Down Expand Up @@ -457,7 +461,7 @@ const Dialogs = {
// Hence this is one of the approach to get the choose button.
var getOcDialog = self.$filePicker.closest('.oc-dialog');
var buttonEnableDisable = getOcDialog.find('.primary');
if (self.$filePicker.data('mimetype').indexOf("httpd/unix-directory") !== -1) {
if (self.$filePicker.data('mimetype').indexOf("httpd/unix-directory") !== -1 && !self.$filePicker.data('.allowDirectoryChooser')) {
buttonEnableDisable.prop("disabled", false);
} else {
buttonEnableDisable.prop("disabled", true);
Expand Down Expand Up @@ -1178,7 +1182,7 @@ const Dialogs = {
} else if ($element.data('type') === 'dir') {
this._fillFilePicker(this.$filePicker.data('path') + '/' + $element.data('entryname'));
this._changeButtonsText(type, $element.data('entryname'));
if (this.$filePicker.data('mimetype').indexOf("httpd/unix-directory") !== -1) {
if (this.$filePicker.data('mimetype').indexOf("httpd/unix-directory") !== -1 || this.$filePicker.data('allowDirectoryChooser')) {
buttonEnableDisable.prop("disabled", false);
} else {
buttonEnableDisable.prop("disabled", true);
Expand Down