Skip to content

Commit 285fde3

Browse files
authored
Merge pull request #8200 from 4teamwork/ran/TI-2888/sorting-toc-beschluss
Disable grouping for decision sequence toc
2 parents ea8b2ed + 6fdc4b7 commit 285fde3

3 files changed

Lines changed: 8 additions & 29 deletions

File tree

changes/TI-2888.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Disable grouping for toc sorted by decision sequence. [ran]

opengever/meeting/tests/test_toc.py

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -742,12 +742,7 @@ class TestTOCByDecisionSequenceNumber(TestAlphabeticalTOC):
742742
'meeting_start_page_number': 33,
743743
'repository_folder_title': u'\xc4 Business',
744744
'title': u'proposal 1'
745-
}
746-
],
747-
'group_title': ''
748-
},
749-
{
750-
'contents': [
745+
},
751746
{
752747
'decision_number': 3,
753748
'description': None,
@@ -757,11 +752,7 @@ class TestTOCByDecisionSequenceNumber(TestAlphabeticalTOC):
757752
'meeting_start_page_number': 33,
758753
'repository_folder_title': u'\xc4 Business',
759754
'title': u'\xc4a proposal'
760-
}
761-
],
762-
'group_title': ''},
763-
{
764-
'contents': [
755+
},
765756
{
766757
'decision_number': 4,
767758
'description': None,
@@ -771,11 +762,7 @@ class TestTOCByDecisionSequenceNumber(TestAlphabeticalTOC):
771762
'meeting_start_page_number': 129,
772763
'repository_folder_title': u'A Business',
773764
'title': u'Proposal 3'
774-
}
775-
],
776-
'group_title': ''},
777-
{
778-
'contents': [
765+
},
779766
{
780767
'decision_number': 5,
781768
'description': u'Really, Anything.',
@@ -785,11 +772,7 @@ class TestTOCByDecisionSequenceNumber(TestAlphabeticalTOC):
785772
'meeting_start_page_number': 129,
786773
'repository_folder_title': u'Other Stuff',
787774
'title': u'Anything goes'
788-
}
789-
],
790-
'group_title': ''},
791-
{
792-
'contents': [
775+
},
793776
{
794777
'decision_number': 6,
795778
'description': None,
@@ -809,11 +792,7 @@ class TestTOCByDecisionSequenceNumber(TestAlphabeticalTOC):
809792
'meeting_start_page_number': 129,
810793
'repository_folder_title': None,
811794
'title': u'Nahhh not here either'
812-
}
813-
],
814-
'group_title': ''},
815-
{
816-
'contents': [
795+
},
817796
{
818797
'decision_number': 8,
819798
'description': None,
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
21
from opengever.meeting.toc.alphabetical import AlphabeticalToc
32

43

54
class DecisionSequenceNumberBasedTOC(AlphabeticalToc):
65
def sort_items(self, items):
76
return sorted(items, key=lambda item: item.get('decision_number') or ' ')
87

9-
def get_group_title(self, group_key, contents):
10-
return ''
8+
def group_items(self, sorted_items):
9+
return [{'group_title': '', 'contents': sorted_items}]

0 commit comments

Comments
 (0)