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

Merge pull request #12474 from nextcloud/default-to-files-list

Browse source 
Rollback to default list view
This commit is contained in:
Morris Jobke 2018-11-16 13:48:16 +01:00 committed by GitHub
commit 9a6d60e95f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/files/lib/Controller/ViewController.php
View file

@ -257,7 +257,7 @@ class ViewController extends Controller {
$params['allowShareWithLink'] = $this->config->getAppValue('core', 'shareapi_allow_links', 'yes');
$params['defaultFileSorting'] = $this->config->getUserValue($user, 'files', 'file_sorting', 'name');
$params['defaultFileSortingDirection'] = $this->config->getUserValue($user, 'files', 'file_sorting_direction', 'asc');
$params['showgridview'] = $this->config->getUserValue($user, 'files', 'show_grid', true);
$params['showgridview'] = $this->config->getUserValue($user, 'files', 'show_grid', false);
$params['isIE'] = \OCP\Util::isIE();
$showHidden = (bool) $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'show_hidden', false);
$params['showHiddenFiles'] = $showHidden ? 1 : 0;

2
apps/files/list.php
View file

@ -26,7 +26,7 @@ $userSession = \OC::$server->getUserSession();
// TODO: move this to the generated config.js
$publicUploadEnabled = $config->getAppValue('core', 'shareapi_allow_public_upload', 'yes');
$showgridview = $config->getUserValue($userSession->getUser()->getUID(), 'files', 'show_grid', true);
$showgridview = $config->getUserValue($userSession->getUser()->getUID(), 'files', 'show_grid', false);
$isIE = \OCP\Util::isIE();
// renders the controls and table headers template

2
apps/files/recentlist.php
View file

@ -26,7 +26,7 @@ OCP\User::checkLoggedIn();
$config = \OC::$server->getConfig();
$userSession = \OC::$server->getUserSession();
$showgridview = $config->getUserValue($userSession->getUser()->getUID(), 'files', 'show_grid', true);
$showgridview = $config->getUserValue($userSession->getUser()->getUID(), 'files', 'show_grid', false);
$isIE = \OCP\Util::isIE();
$tmpl = new OCP\Template('files', 'recentlist', '');

2
apps/files/simplelist.php
View file

@ -25,7 +25,7 @@
$config = \OC::$server->getConfig();
$userSession = \OC::$server->getUserSession();
$showgridview = $config->getUserValue($userSession->getUser()->getUID(), 'files', 'show_grid', true);
$showgridview = $config->getUserValue($userSession->getUser()->getUID(), 'files', 'show_grid', false);
$isIE = \OCP\Util::isIE();
// renders the controls and table headers template

4
apps/files/tests/Controller/ViewControllerTest.php
View file

@ -131,7 +131,7 @@ class ViewControllerTest extends TestCase {
[$this->user->getUID(), 'files', 'file_sorting', 'name', 'name'],
[$this->user->getUID(), 'files', 'file_sorting_direction', 'asc', 'asc'],
[$this->user->getUID(), 'files', 'show_hidden', false, false],
[$this->user->getUID(), 'files', 'show_grid', true, true],
[$this->user->getUID(), 'files', 'show_grid', true],
]));
$this->config
@ -367,7 +367,7 @@ class ViewControllerTest extends TestCase {
],
],
'hiddenFields' => [],
'showgridview' => true,
'showgridview' => false,
'isIE' => false,
]
);

4
apps/files_sharing/lib/Controller/ShareController.php
View file

@ -360,7 +360,7 @@ class ShareController extends AuthPublicShareController {
$folder->assign('isPublic', true);
$folder->assign('hideFileList', $hideFileList);
$folder->assign('publicUploadEnabled', 'no');
$folder->assign('showgridview', true);
$folder->assign('showgridview', false);
$folder->assign('uploadMaxFilesize', $maxUploadFilesize);
$folder->assign('uploadMaxHumanFilesize', \OCP\Util::humanFileSize($maxUploadFilesize));
$folder->assign('freeSpace', $freeSpace);
@ -371,7 +371,7 @@ class ShareController extends AuthPublicShareController {
$shareIsFolder = false;
}
$shareTmpl['showgridview'] = true;
$shareTmpl['showgridview'] = false;
$shareTmpl['hideFileList'] = $hideFileList;
$shareTmpl['shareOwner'] = $this->userManager->get($share->getShareOwner())->getDisplayName();

2
apps/files_sharing/list.php
View file

@ -24,7 +24,7 @@ OCP\User::checkLoggedIn();
$config = \OC::$server->getConfig();
$userSession = \OC::$server->getUserSession();
$showgridview = $config->getUserValue($userSession->getUser()->getUID(), 'files', 'show_grid', true);
$showgridview = $config->getUserValue($userSession->getUser()->getUID(), 'files', 'show_grid', false);
$isIE = \OCP\Util::isIE();
$tmpl = new OCP\Template('files_sharing', 'list', '');

6
apps/files_sharing/tests/Controller/ShareControllerTest.php
View file

@ -290,7 +290,7 @@ class ShareControllerTest extends \Test\TestCase {
'previewURL' => 'downloadURL',
'note' => $note,
'hideDownload' => false,
'showgridview' => true
'showgridview' => false
);
$csp = new \OCP\AppFramework\Http\ContentSecurityPolicy();
@ -410,7 +410,7 @@ class ShareControllerTest extends \Test\TestCase {
'previewURL' => 'downloadURL',
'note' => $note,
'hideDownload' => true,
'showgridview' => true
'showgridview' => false
);
$csp = new \OCP\AppFramework\Http\ContentSecurityPolicy();
@ -509,7 +509,7 @@ class ShareControllerTest extends \Test\TestCase {
'previewURL' => '',
'note' => '',
'hideDownload' => false,
'showgridview' => true
'showgridview' => false
);
$csp = new \OCP\AppFramework\Http\ContentSecurityPolicy();

2
apps/files_trashbin/list.php
View file

@ -27,7 +27,7 @@ OCP\User::checkLoggedIn();
$config = \OC::$server->getConfig();
$userSession = \OC::$server->getUserSession();
$showgridview = $config->getUserValue($userSession->getUser()->getUID(), 'files', 'show_grid', true);
$showgridview = $config->getUserValue($userSession->getUser()->getUID(), 'files', 'show_grid', false);
$isIE = \OCP\Util::isIE();
$tmpl = new OCP\Template('files_trashbin', 'index', '');