sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

load file sorting mode from the db

remotes/origin/laravel-queue
Christoph Wurst 2016-04-12 10:19:52 +07:00
parent 838e9e3126
commit 3f492dd826
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/files/controller/viewcontroller.php
Unescape Escape View File

@ -213,6 +213,7 @@ class ViewController extends Controller {
$params['mailNotificationEnabled'] = $this->config->getAppValue('core', 'shareapi_allow_mail_notification', 'no');
$params['mailPublicNotificationEnabled'] = $this->config->getAppValue('core', 'shareapi_allow_public_notification', 'no');
$params['allowShareWithLink'] = $this->config->getAppValue('core', 'shareapi_allow_links', 'yes');
$params['defaultFileSorting'] = $this->config->getAppValue('files', 'file_sorting', 'name');
$params['appNavigation'] = $nav;
$params['appContents'] = $contentItems;
$this->navigationManager->setActiveEntry('files_index');

3
apps/files/js/app.js
Unescape Escape View File

@ -72,7 +72,8 @@
fileActions: fileActions,
allowLegacyActions: true,
scrollTo: urlParams.scrollto,
filesClient: OC.Files.getClient()
filesClient: OC.Files.getClient(),
sorting: $('#defaultFileSorting').val()
}
);
this.files.initialize();

6
apps/files/js/filelist.js
Unescape Escape View File

@ -239,7 +239,11 @@
this.fileSummary = this._createSummary();
this.setSort('name', 'asc');
if (options.sorting) {
this.setSort(options.sorting, 'asc');
} else {
this.setSort('name', 'asc');
}
var breadcrumbOptions = {
onClick: _.bind(this._onClickBreadCrumb, this),

1
apps/files/templates/index.php
Unescape Escape View File

@ -18,4 +18,5 @@
<input type="hidden" name="mailNotificationEnabled" id="mailNotificationEnabled" value="<?php p($_['mailNotificationEnabled']) ?>" />
<input type="hidden" name="mailPublicNotificationEnabled" id="mailPublicNotificationEnabled" value="<?php p($_['mailPublicNotificationEnabled']) ?>" />
<input type="hidden" name="allowShareWithLink" id="allowShareWithLink" value="<?php p($_['allowShareWithLink']) ?>" />
<input type="hidden" name="defaultFileSorting" id="defaultFileSorting" value="<?php p($_['defaultFileSorting']) ?>" />
<?php endif;