aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files/lib/Controller/ApiController.php
diff options
context:
space:
mode:
authorfnuesse <felix.nuesse@t-online.de>2018-06-27 10:40:32 +0200
committerJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2018-07-12 16:49:39 +0200
commitc9995de2db2072960144163d62e2507e393d32b6 (patch)
treefda20d08557ae40604a799e45de35ddbcb313d0e /apps/files/lib/Controller/ApiController.php
parent55ebdc9344dc8edb665491bf89595f406cfc4d62 (diff)
downloadnextcloud-server-c9995de2db2072960144163d62e2507e393d32b6.tar.gz
nextcloud-server-c9995de2db2072960144163d62e2507e393d32b6.zip
Added drop-animation to sortable-list
Signed-off-by: fnuesse <felix.nuesse@t-online.de> Added icon-change on drag Signed-off-by: fnuesse <felix.nuesse@t-online.de> Fixed Navbar-closing in app when favorites-list is toggled on mobile Signed-off-by: fnuesse <felix.nuesse@t-online.de> Refactored Code Signed-off-by: fnuesse <felix.nuesse@t-online.de> Changed to alphabetical sorting Signed-off-by: fnuesse <felix.nuesse@t-online.de> Fixed deletion of folder with identical names Signed-off-by: fnuesse <felix.nuesse@t-online.de> Removed ability to add files to the quickaccess Signed-off-by: fnuesse <felix.nuesse@t-online.de> Fixed wrong path-generation when added from favorites-star Signed-off-by: fnuesse <felix.nuesse@t-online.de> Removed Element from navbar when favorite-star in detailview is toggled off Signed-off-by: fnuesse <felix.nuesse@t-online.de> Changed Quota-Text to prevent boundarybreaks Reverted last commit
Diffstat (limited to 'apps/files/lib/Controller/ApiController.php')
-rw-r--r--apps/files/lib/Controller/ApiController.php18
1 files changed, 16 insertions, 2 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();
+ }
+
+
}