Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>tags/v15.0.0RC1
@@ -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; |
@@ -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 |
@@ -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', ''); |
@@ -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 |
@@ -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, | |||
] | |||
); |
@@ -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(); |
@@ -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', ''); |
@@ -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(); |
@@ -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', ''); |