snuffster/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

server/tags: fix tag sorting

Browse source 
Brainfart from d6942121e5
This commit is contained in:
rr- 2016-08-14 17:54:15 +02:00
parent 023ec9a976
commit ef4af697c4
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/szurubooru/func/tags.py
View file

@ -63,7 +63,7 @@ def sort_tags(tags):
return sorted( return sorted(
tags, tags,
key=lambda tag: ( key=lambda tag: (
default_category_name != tag.category.name, default_category_name == tag.category.name,
tag.category.name, tag.category.name,
tag.names[0].name) tag.names[0].name)
) )

8
server/szurubooru/tests/func/test_tags.py
View file

@ -19,10 +19,10 @@ def _assert_tag_siblings(result, expected_names_and_occurrences):
@pytest.mark.parametrize('input,expected_tag_names', [ @pytest.mark.parametrize('input,expected_tag_names', [
([('a', 'a', True), ('b', 'b', False), ('c', 'c', False)], list('abc')), ([('a', 'a', True), ('b', 'b', False), ('c', 'c', False)], list('bca')),
([('c', 'a', True), ('b', 'b', False), ('a', 'c', False)], list('cba')), ([('c', 'a', True), ('b', 'b', False), ('a', 'c', False)], list('bac')),
([('a', 'c', True), ('b', 'b', False), ('c', 'a', False)], list('acb')), ([('a', 'c', True), ('b', 'b', False), ('c', 'a', False)], list('cba')),
([('a', 'c', False), ('b', 'b', False), ('c', 'a', True)], list('cba')), ([('a', 'c', False), ('b', 'b', False), ('c', 'a', True)], list('bac')),
]) ])
def test_sort_tags( def test_sort_tags(
input, expected_tag_names, tag_factory, tag_category_factory): input, expected_tag_names, tag_factory, tag_category_factory):