diff options
Diffstat (limited to 'apps/files/lib/Controller')
| -rw-r--r-- | apps/files/lib/Controller/ApiController.php | 18 | ||||
| -rw-r--r-- | apps/files/lib/Controller/ViewController.php | 9 |
2 files changed, 24 insertions, 3 deletions
diff --git a/apps/files/lib/Controller/ApiController.php b/apps/files/lib/Controller/ApiController.php index 9269f336f35..3738358bfb0 100644 --- a/apps/files/lib/Controller/ApiController.php +++ b/apps/files/lib/Controller/ApiController.php @@ -215,6 +215,7 @@ class ApiController extends Controller { $favorites[$i]['id'] = $node->getId(); $favorites[$i]['name'] = $node->getName(); + $favorites[$i]['path'] = $node->getInternalPath(); $favorites[$i]['mtime'] = $node->getMTime(); $i++; } @@ -336,7 +337,7 @@ class ApiController extends Controller { * @return String */ public function getSortingStrategy() { - return $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'quickaccess_sorting_strategy', 'date'); + return $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'quickaccess_sorting_strategy', 'alphabet'); } /** @@ -411,11 +412,24 @@ class ApiController extends Controller { * * @NoAdminRequired * - * @param String * @return String */ public function getSortingOrder() { return $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'quickaccess_custom_sorting_order', ""); } + /** + * Get sorting-order for custom sorting + * + * @NoAdminRequired + * + * @param String + * @return String + */ + public function getNodeType($folderpath) { + $node = $this->userFolder->get($folderpath); + return $node->getType(); + } + + } diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php index 82f9ea000af..13b33b96cc8 100644 --- a/apps/files/lib/Controller/ViewController.php +++ b/apps/files/lib/Controller/ViewController.php @@ -207,6 +207,13 @@ class ViewController extends Controller { $defaultExpandedState = 'false'; } + $quickAccessDraggable = 'false'; + //See Javascript navigation.js for possible sorting strategies + if($this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'quickaccess_sorting_strategy', 'alphabet')=='customorder'){ + $quickAccessDraggable = 'true'; + } + + \OCA\Files\App::getNavigationManager()->add( [ 'id' => 'favorites', @@ -216,7 +223,7 @@ class ViewController extends Controller { 'order' => 5, 'name' => $this->l10n->t('Favorites'), 'sublist' => $favoritesSublistArray, - 'draggableSublist' => 'true', + 'draggableSublist' => $quickAccessDraggable, 'defaultExpandedState' => $defaultExpandedState, 'enableMenuButton' => 0, ] |