Rollback to default list view

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php
index 3932b2b0a8e0cdb3b24a578655fa11ef5d0cfd90..fc0fb120cfe4f62dacd070c5a2e7a5f6230bf207 100644 (file)
--- a/apps/files/lib/Controller/ViewController.php
+++ b/apps/files/lib/Controller/ViewController.php
@@ -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;

diff --git a/apps/files/list.php b/apps/files/list.php
index 7a5159cf387961cb5707591941105b24e9d05eb3..9ceeaaa04913a0dbad1815cca405d68195467843 100644 (file)
--- a/apps/files/list.php
+++ b/apps/files/list.php
@@ -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

diff --git a/apps/files/recentlist.php b/apps/files/recentlist.php
index c17f9d598bfb8076d270546c4bdfd8cc82264c25..99409749e36defd2c59d5cfca4b33846d66ce241 100644 (file)
--- a/apps/files/recentlist.php
+++ b/apps/files/recentlist.php
@@ -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', '');

diff --git a/apps/files/simplelist.php b/apps/files/simplelist.php
index 9515ec623634b121c13b1bc1ab44153adbffa703..d623b251306c950bea328cb261c3b1ec5dc1b44c 100644 (file)
--- a/apps/files/simplelist.php
+++ b/apps/files/simplelist.php
@@ -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

diff --git a/apps/files/tests/Controller/ViewControllerTest.php b/apps/files/tests/Controller/ViewControllerTest.php
index 35fc1e74c1a05b24f55468c5592c070a12bae309..d051ab7258d7dc451f7d4e28ccf29ba3ccbfc549 100644 (file)
--- a/apps/files/tests/Controller/ViewControllerTest.php
+++ b/apps/files/tests/Controller/ViewControllerTest.php
@@ -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,
                        ]
                );

diff --git a/apps/files_sharing/lib/Controller/ShareController.php b/apps/files_sharing/lib/Controller/ShareController.php
index 00c6a7a4985f912bf0ea79f98d10cc76b2002efe..f3ad6223511a74b69d9ccf95aa9de6045fb1ab62 100644 (file)
--- a/apps/files_sharing/lib/Controller/ShareController.php
+++ b/apps/files_sharing/lib/Controller/ShareController.php
@@ -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();

diff --git a/apps/files_sharing/list.php b/apps/files_sharing/list.php
index 590a3a1911e82d097c80e6f5275fe48cbfa87abc..9eed10f8d26a8cb3335232d54b5c6214c479165b 100644 (file)
--- a/apps/files_sharing/list.php
+++ b/apps/files_sharing/list.php
@@ -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', '');

diff --git a/apps/files_sharing/tests/Controller/ShareControllerTest.php b/apps/files_sharing/tests/Controller/ShareControllerTest.php
index 3a9856e1bd284980d2aca7a11a912a5e8352804b..ea9bd8316e20366a0a41f660dc1300af3ce62ea5 100644 (file)
--- a/apps/files_sharing/tests/Controller/ShareControllerTest.php
+++ b/apps/files_sharing/tests/Controller/ShareControllerTest.php
@@ -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();

diff --git a/apps/files_trashbin/list.php b/apps/files_trashbin/list.php
index 48ed7b694d045011f96454a168f3a946f398a5a4..127e0389815474295b2c53a340b36ccd356f5b83 100644 (file)
--- a/apps/files_trashbin/list.php
+++ b/apps/files_trashbin/list.php
@@ -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', '');