Skip to content

fix: sort tags by name #38067

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blizzz merged 2 commits into from
May 11, 2023
Merged

fix: sort tags by name #38067

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
badee49
fix: sort tags by name
blizzz May 4, 2023
e20e18f
fix: use interface instead of implementation as type hint
blizzz May 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix: sort tags by name 
Signed-off-by: Arthur Schiwon <[email protected]>
  • Loading branch information
@blizzz
blizzz committed May 4, 2023
commit badee49b4b3e8d67c3b264326da7be2d0187846e
7 changes: 6 additions & 1 deletion apps/dav/lib/SystemTag/SystemTagPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -34,6 +35,7 @@
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;
Expand Down Expand Up @@ -306,8 +308,11 @@ private function propfindForFile(PropFind $propFind, Node $node): void {
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);
});
}
Expand Down