wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #21359 from owncloud/check-changes

Browse source 
remove mention of 'filesystem_check_changes' => 2 from the config sample
This commit is contained in:
Thomas Müller 2016-01-07 14:07:38 +01:00
commit 29416b07ac
3 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/files_external/js/settings.js
View file

@ -27,7 +27,6 @@ var MOUNT_OPTIONS_DROPDOWN_TEMPLATE =
' <select id="mountOptionsFilesystemCheck" name="filesystem_check_changes" data-type="int">' +
' <option value="0">{{t "files_external" "Never"}}</option>' +
' <option value="1" selected="selected">{{t "files_external" "Once every direct access"}}</option>' +
' <option value="2">{{t "files_external" "Every time the filesystem is used"}}</option>' +
' </select>' +
' </div>' +
'</div>';
@ -39,7 +38,6 @@ var MOUNT_OPTIONS_DROPDOWN_TEMPLATE =
t("files_external", "Check for changes")
t("files_external", "Never")
t("files_external", "Once every direct access")
t("files_external", "Every time the filesystem is used")
*/
/**

4
apps/files_external/tests/js/settingsSpec.js
View file

@ -254,13 +254,13 @@ describe('OCA.External.Settings tests', function() {
// defaults to true
var $field = $td.find('.dropdown [name=previews]');
expect($field.prop('checked')).toEqual(true);
$td.find('.dropdown [name=filesystem_check_changes]').val(2);
$td.find('.dropdown [name=filesystem_check_changes]').val(0);
$('body').mouseup();
expect(JSON.parse($tr.find('input.mountOptions').val())).toEqual({
encrypt: true,
previews: true,
filesystem_check_changes: 2
filesystem_check_changes: 0
});
});
});

3
config/config.sample.php
View file

@ -1063,9 +1063,6 @@ $CONFIG = array(
*
* 1 -> Check each file or folder at most once per request, recommended for
* general use if outside changes might happen.
*
* 2 -> Check every time the filesystem is used, causes a performance hit when
* using external storages, not recommended for regular use.
*/
'filesystem_check_changes' => 0,