ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2932 from emanuelschuetze/fix-category-numbering

Browse Source 
Fixed motion numbering in category sort view.
This commit is contained in:
Norman Jäckel 2017-02-06 14:29:19 +01:00 committed by GitHub
commit 2e410599bb
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
openslides/motions/views.py
View File

@ -1,6 +1,7 @@
import base64 import base64
import re import re
from django.conf import settings
from django.contrib.staticfiles import finders from django.contrib.staticfiles import finders
from django.db import IntegrityError, transaction from django.db import IntegrityError, transaction
from django.http import Http404 from django.http import Http404
@ -426,9 +427,14 @@ class CategoryViewSet(ModelViewSet):
number = 0 number = 0
instances = [] instances = []
# If MOTION_IDENTIFIER_WITHOUT_BLANKS is set, don't use blanks when building identifier.
without_blank = hasattr(settings, 'MOTION_IDENTIFIER_WITHOUT_BLANKS') and settings.MOTION_IDENTIFIER_WITHOUT_BLANKS
# Prepare ordered list of motions. # Prepare ordered list of motions.
if not category.prefix: if not category.prefix:
prefix = '' prefix = ''
elif without_blank:
prefix = '%s' % category.prefix
else: else:
prefix = '%s ' % category.prefix prefix = '%s ' % category.prefix
motions = category.motion_set.all() motions = category.motion_set.all()
@ -447,6 +453,9 @@ class CategoryViewSet(ModelViewSet):
for motion in motions: for motion in motions:
if motion.is_amendment(): if motion.is_amendment():
parent_identifier = motion.parent.identifier or '' parent_identifier = motion.parent.identifier or ''
if without_blank:
prefix = '%s%s' % (parent_identifier, config['motions_amendments_prefix'])
else:
prefix = '%s %s ' % (parent_identifier, config['motions_amendments_prefix']) prefix = '%s %s ' % (parent_identifier, config['motions_amendments_prefix'])
number += 1 number += 1
new_identifier = '%s%s' % (prefix, motion.extend_identifier_number(number)) new_identifier = '%s%s' % (prefix, motion.extend_identifier_number(number))