From c9995de2db2072960144163d62e2507e393d32b6 Mon Sep 17 00:00:00 2001 From: fnuesse Date: Wed, 27 Jun 2018 10:40:32 +0200 Subject: Added drop-animation to sortable-list Signed-off-by: fnuesse Added icon-change on drag Signed-off-by: fnuesse Fixed Navbar-closing in app when favorites-list is toggled on mobile Signed-off-by: fnuesse Refactored Code Signed-off-by: fnuesse Changed to alphabetical sorting Signed-off-by: fnuesse Fixed deletion of folder with identical names Signed-off-by: fnuesse Removed ability to add files to the quickaccess Signed-off-by: fnuesse Fixed wrong path-generation when added from favorites-star Signed-off-by: fnuesse Removed Element from navbar when favorite-star in detailview is toggled off Signed-off-by: fnuesse Changed Quota-Text to prevent boundarybreaks Reverted last commit --- apps/files/lib/Controller/ApiController.php | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'apps/files/lib/Controller/ApiController.php') 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(); + } + + } -- cgit v1.2.3