From badee49b4b3e8d67c3b264326da7be2d0187846e Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Thu, 4 May 2023 13:15:15 +0200 Subject: fix: sort tags by name Signed-off-by: Arthur Schiwon --- apps/dav/lib/SystemTag/SystemTagPlugin.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'apps/dav') diff --git a/apps/dav/lib/SystemTag/SystemTagPlugin.php b/apps/dav/lib/SystemTag/SystemTagPlugin.php index c5c828cfbff..8f0c4d0eedc 100644 --- a/apps/dav/lib/SystemTag/SystemTagPlugin.php +++ b/apps/dav/lib/SystemTag/SystemTagPlugin.php @@ -25,6 +25,7 @@ */ namespace OCA\DAV\SystemTag; +use OC\SystemTag\SystemTag; use OCA\DAV\Connector\Sabre\Directory; use OCA\DAV\Connector\Sabre\Node; use OCP\IGroupManager; @@ -34,6 +35,7 @@ use OCP\SystemTag\ISystemTag; use OCP\SystemTag\ISystemTagManager; use OCP\SystemTag\ISystemTagObjectMapper; use OCP\SystemTag\TagAlreadyExistsException; +use OCP\Util; use Sabre\DAV\Exception\BadRequest; use Sabre\DAV\Exception\Conflict; use Sabre\DAV\Exception\Forbidden; @@ -306,8 +308,11 @@ class SystemTagPlugin extends \Sabre\DAV\ServerPlugin { if ($user === null) { return; } - + $tags = $this->getTagsForFile($node->getId(), $user); + usort($tags, function (SystemTag $tagA, SystemTag $tagB): int { + return Util::naturalSortCompare($tagA->getName(), $tagB->getName()); + }); return new SystemTagList($tags, $this->tagManager, $user); }); } -- cgit v1.2.3