Item type changed from CharField to IntegerField. Constant type names added.
This commit is contained in:
parent
9f3dae8059
commit
7f03e02e9a
@ -31,10 +31,13 @@ class Item(MPTTModel, SlideMixin):
|
|||||||
"""
|
"""
|
||||||
prefix = 'item'
|
prefix = 'item'
|
||||||
|
|
||||||
|
AGENDA_ITEM = 1
|
||||||
|
ORGANIZATIONAL_ITEM = 2
|
||||||
|
|
||||||
ITEM_TYPE = (
|
ITEM_TYPE = (
|
||||||
('agd', _('Agenda item')),
|
(AGENDA_ITEM, _('Agenda item')),
|
||||||
('org', _('Organizational item')),
|
(ORGANIZATIONAL_ITEM, _('Organizational item')),
|
||||||
)
|
)
|
||||||
|
|
||||||
title = models.CharField(null=True, max_length=255, verbose_name=_("Title"))
|
title = models.CharField(null=True, max_length=255, verbose_name=_("Title"))
|
||||||
text = models.TextField(null=True, blank=True, verbose_name=_("Text"))
|
text = models.TextField(null=True, blank=True, verbose_name=_("Text"))
|
||||||
@ -43,8 +46,8 @@ class Item(MPTTModel, SlideMixin):
|
|||||||
weight = models.IntegerField(default=0, verbose_name=_("Weight"))
|
weight = models.IntegerField(default=0, verbose_name=_("Weight"))
|
||||||
parent = TreeForeignKey('self', null=True, blank=True,
|
parent = TreeForeignKey('self', null=True, blank=True,
|
||||||
related_name='children')
|
related_name='children')
|
||||||
type = models.CharField(max_length=3, choices=ITEM_TYPE,
|
type = models.IntegerField(max_length=1, choices=ITEM_TYPE,
|
||||||
default='agd', verbose_name=_("Type"))
|
default=AGENDA_ITEM, verbose_name=_("Type"))
|
||||||
|
|
||||||
duration = models.TimeField(blank=True, null=True, verbose_name=_("Duration (hh:mm)"));
|
duration = models.TimeField(blank=True, null=True, verbose_name=_("Duration (hh:mm)"));
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@ from django.utils.translation import ugettext as _
|
|||||||
def agenda_show():
|
def agenda_show():
|
||||||
from openslides.agenda.models import Item
|
from openslides.agenda.models import Item
|
||||||
data = {}
|
data = {}
|
||||||
items = Item.objects.filter(parent=None, type__exact='agd')
|
items = Item.objects.filter(parent=None, type__exact=Item.AGENDA_ITEM)
|
||||||
data['title'] = _("Agenda")
|
data['title'] = _("Agenda")
|
||||||
data['items'] = items
|
data['items'] = items
|
||||||
data['template'] = 'projector/AgendaSummary.html'
|
data['template'] = 'projector/AgendaSummary.html'
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
{% if perms.agenda.can_manage_agenda %}
|
{% if perms.agenda.can_manage_agenda %}
|
||||||
<div class="dragcell"></div>
|
<div class="dragcell"></div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<a href="{% model_url item 'view' %}">{% if item.type == "org" %}<i>[{% endif %}{{ item }}{% if item.type == "org" %}]</i>{% endif %}</a>
|
<a href="{% model_url item 'view' %}">{% if item.type == item.ORGANIZATIONAL_ITEM %}<i>[{% endif %}{{ item }}{% if item.type == item.ORGANIZATIONAL_ITEM %}]</i>{% endif %}</a>
|
||||||
{{ item.get_title_supplement|safe }}
|
{{ item.get_title_supplement|safe }}
|
||||||
</td>
|
</td>
|
||||||
{% if perms.agenda.can_manage_agenda %}
|
{% if perms.agenda.can_manage_agenda %}
|
||||||
|
@ -39,7 +39,7 @@
|
|||||||
{% for p in item.get_ancestors %}
|
{% for p in item.get_ancestors %}
|
||||||
<span class="indentation"> </span>
|
<span class="indentation"> </span>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
<a href="{% model_url item 'view' %}">{% if item.type == "org" %}<i>[{% endif %}{{ item }}{% if item.type == "org" %}]</i>{% endif %}</a>
|
<a href="{% model_url item 'view' %}">{% if item.type == item.ORGANIZATIONAL_ITEM %}<i>[{% endif %}{{ item }}{% if item.type == item.ORGANIZATIONAL_ITEM %}]</i>{% endif %}</a>
|
||||||
{{ item.get_title_supplement|safe }}
|
{{ item.get_title_supplement|safe }}
|
||||||
</li>
|
</li>
|
||||||
{% empty %}
|
{% empty %}
|
||||||
|
@ -47,7 +47,7 @@ class Overview(TemplateView):
|
|||||||
if self.request.user.has_perm('agenda.can_see_orga_items'):
|
if self.request.user.has_perm('agenda.can_see_orga_items'):
|
||||||
items = Item.objects.all()
|
items = Item.objects.all()
|
||||||
else:
|
else:
|
||||||
items = Item.objects.filter(type__exact = 'agd')
|
items = Item.objects.filter(type__exact=Item.AGENDA_ITEM)
|
||||||
|
|
||||||
duration = timedelta()
|
duration = timedelta()
|
||||||
|
|
||||||
@ -220,7 +220,7 @@ class AgendaPDF(PDFView):
|
|||||||
document_title = ugettext_lazy('Agenda')
|
document_title = ugettext_lazy('Agenda')
|
||||||
|
|
||||||
def append_to_pdf(self, story):
|
def append_to_pdf(self, story):
|
||||||
for item in Item.objects.filter(type__exact = 'agd'):
|
for item in Item.objects.filter(type__exact=Item.AGENDA_ITEM):
|
||||||
ancestors = item.get_ancestors()
|
ancestors = item.get_ancestors()
|
||||||
if ancestors:
|
if ancestors:
|
||||||
space = " " * 6 * ancestors.count()
|
space = " " * 6 * ancestors.count()
|
||||||
|
Loading…
Reference in New Issue
Block a user