mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #22341 from nextcloud/backport/22335/stable19 

[stable19] Remove encryption option for nextcloud external storage
This commit is contained in:
Roeland Jago Douma 2020-08-21 09:24:35 +02:00 committed by GitHub
parent cb28b81675 779df24b62
commit 9c99245ed7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/files_external/js/settings.js
View File

@ -475,7 +475,9 @@ MountOptionsDropdown.prototype = {
})); }));
this.$el = $el; this.$el = $el;
this.setOptions(mountOptions, visibleOptions); var storage = $container[0].parentNode.className;
this.setOptions(mountOptions, visibleOptions, storage);
this.$el.appendTo($container); this.$el.appendTo($container);
MountOptionsDropdown._last = this; MountOptionsDropdown._last = this;
@ -523,7 +525,13 @@ MountOptionsDropdown.prototype = {
* @param {Object} options mount options * @param {Object} options mount options
* @param {Array} visibleOptions enabled mount options * @param {Array} visibleOptions enabled mount options
*/ */
setOptions: function(options, visibleOptions) { setOptions: function(options, visibleOptions, storage) {
if (storage === 'owncloud') {
var ind = visibleOptions.indexOf('encrypt');
if (ind > 0) {
visibleOptions.splice(ind, 1);
}
}
var $el = this.$el; var $el = this.$el;
_.each(options, function(value, key) { _.each(options, function(value, key) {
var $optionEl = $el.find('input, select').filterAttr('name', key); var $optionEl = $el.find('input, select').filterAttr('name', key);