Skip to content

Move/copy file picker: Remeber last destination and start in current folder #12381

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
MorrisJobke merged 4 commits into from
Jan 18, 2019
Merged

Move/copy file picker: Remeber last destination and start in current folder #12381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
528964e
copy Dialog starts in current directory
rummatee Nov 9, 2018
37270fc
remember last copied to directory
rummatee Nov 9, 2018
ecb9364
also remember folder for multiselect actions
rummatee Dec 23, 2018
332b4ae
fix testing for undefined
rummatee Jan 7, 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
7 changes: 6 additions & 1 deletion apps/files/js/fileactions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -648,14 +648,19 @@
if (permissions & OC.PERMISSION_UPDATE) {
actions = OC.dialogs.FILEPICKER_TYPE_COPY_MOVE;
}
var dialogDir = context.dir;
if (typeof context.fileList.dirInfo.dirLastCopiedTo !== 'undefined') {
dialogDir = context.fileList.dirInfo.dirLastCopiedTo;
}
OC.dialogs.filepicker(t('files', 'Choose target folder'), function(targetPath, type) {
if (type === OC.dialogs.FILEPICKER_TYPE_COPY) {
context.fileList.copy(filename, targetPath, false, context.dir);
}
if (type === OC.dialogs.FILEPICKER_TYPE_MOVE) {
context.fileList.move(filename, targetPath, false, context.dir);
}
}, false, "httpd/unix-directory", true, actions);
context.fileList.dirInfo.dirLastCopiedTo = targetPath;
}, false, "httpd/unix-directory", true, actions, dialogDir);
}
});

Expand Down
7 changes: 6 additions & 1 deletion apps/files/js/filelist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -918,6 +918,10 @@
};

var actions = this.isSelectedMovable() ? OC.dialogs.FILEPICKER_TYPE_COPY_MOVE : OC.dialogs.FILEPICKER_TYPE_COPY;
var dialogDir = self.getCurrentDirectory();
if (typeof self.dirInfo.dirLastCopiedTo !== 'undefined') {
dialogDir = self.dirInfo.dirLastCopiedTo;
}
OC.dialogs.filepicker(t('files', 'Choose target folder'), function(targetPath, type) {
self.fileMultiSelectMenu.toggleLoading('copyMove', true);
if (type === OC.dialogs.FILEPICKER_TYPE_COPY) {
Expand All @@ -926,7 +930,8 @@
if (type === OC.dialogs.FILEPICKER_TYPE_MOVE) {
self.move(files, targetPath, disableLoadingState);
}
}, false, "httpd/unix-directory", true, actions);
self.dirInfo.dirLastCopiedTo = targetPath;
}, false, "httpd/unix-directory", true, actions, dialogDir);
event.preventDefault();
},

Expand Down
8 changes: 5 additions & 3 deletions core/js/oc-dialogs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,9 @@ var OCdialogs = {
* @param mimetypeFilter mimetype to filter by - directories will always be included
* @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
*/
filepicker:function(title, callback, multiselect, mimetypeFilter, modal, type) {
filepicker:function(title, callback, multiselect, mimetypeFilter, modal, type, path) {
var self = this;

this.filepicker.sortField = 'name';
Expand All @@ -214,6 +215,7 @@ var OCdialogs = {
this.filepicker.filesClient = (OCA.Sharing && OCA.Sharing.PublicApp && OCA.Sharing.PublicApp.fileList)? OCA.Sharing.PublicApp.fileList.filesClient: OC.Files.getClient();

this.filelist = null;
path = path || '';

$.when(this._getFilePickerTemplate()).then(function($tmpl) {
self.filepicker.loading = false;
Expand All @@ -234,7 +236,7 @@ var OCdialogs = {
title: title,
emptytext: emptyText,
newtext: newText
}).data('path', '').data('multiselect', multiselect).data('mimetype', mimetypeFilter);
}).data('path', path).data('multiselect', multiselect).data('mimetype', mimetypeFilter);

if (modal === undefined) {
modal = false;
Expand Down Expand Up @@ -355,7 +357,7 @@ var OCdialogs = {
self.filepicker.sortOrder = self.filepicker.sortOrder === 'asc' ? 'desc' : 'asc';
self._fillFilePicker(dir);
});
self._fillFilePicker('');
self._fillFilePicker(path);
});

// build buttons
Expand Down