From 357914fac5c888ba4223a1b9a74bde05d80b099e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89lie=20Bouttier?= Date: Wed, 5 Oct 2016 21:06:10 +0200 Subject: [PATCH] add managers to track --- proposals/forms.py | 3 ++- proposals/migrations/0014_track_managers.py | 22 +++++++++++++++++++ proposals/models.py | 2 ++ proposals/templates/proposals/track_list.html | 2 ++ 4 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 proposals/migrations/0014_track_managers.py diff --git a/proposals/forms.py b/proposals/forms.py index 5ee68db..a0b96c7 100644 --- a/proposals/forms.py +++ b/proposals/forms.py @@ -141,7 +141,8 @@ class TrackForm(forms.ModelForm): class Meta: model = Track - fields = ['name', 'description'] + fields = ['name', 'description', 'managers'] + widgets = {'managers': Select2TagWidget()} def clean_name(self): name = self.cleaned_data['name'] diff --git a/proposals/migrations/0014_track_managers.py b/proposals/migrations/0014_track_managers.py new file mode 100644 index 0000000..0a995d5 --- /dev/null +++ b/proposals/migrations/0014_track_managers.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-10-05 19:02 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('proposals', '0013_auto_20160928_1802'), + ] + + operations = [ + migrations.AddField( + model_name='track', + name='managers', + field=models.ManyToManyField(blank=True, to=settings.AUTH_USER_MODEL, verbose_name='Managers'), + ), + ] diff --git a/proposals/models.py b/proposals/models.py index 86b08cb..9ca97c6 100644 --- a/proposals/models.py +++ b/proposals/models.py @@ -44,6 +44,8 @@ class Track(PonyConfModel): slug = AutoSlugField(populate_from='name') description = models.TextField(blank=True, verbose_name=_('Description')) + managers = models.ManyToManyField(User, blank=True, verbose_name=_('Managers')) + class Meta: unique_together = ('site', 'name') diff --git a/proposals/templates/proposals/track_list.html b/proposals/templates/proposals/track_list.html index 1aec290..1a5c7ca 100644 --- a/proposals/templates/proposals/track_list.html +++ b/proposals/templates/proposals/track_list.html @@ -18,6 +18,8 @@

{{ track }}

{{ track.description }}

{% if request|staff %} + {{ track.managers.count }} {% trans "manager" %}{{ track.managers.count|pluralize }} + | {{ track.talk_set.count }} {% trans "talk" %}{{ track.talk_set.count|pluralize }} | {% bootstrap_icon "pencil" %}