From eac67fed1359dfd79613138dfb4d8f40cbe07fc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89lie=20Bouttier?= <elie@bouttier.eu>
Date: Wed, 28 Sep 2016 23:08:11 +0200
Subject: [PATCH] add & edit tracks

---
 proposals/forms.py                            | 16 +++++++++++++
 proposals/templates/proposals/track_form.html | 23 +++++++++++++++++++
 proposals/templates/proposals/track_list.html |  4 ++--
 proposals/urls.py                             |  2 ++
 proposals/views.py                            | 23 ++++++++++++++++++-
 5 files changed, 65 insertions(+), 3 deletions(-)
 create mode 100644 proposals/templates/proposals/track_form.html

diff --git a/proposals/forms.py b/proposals/forms.py
index d360814..991802c 100644
--- a/proposals/forms.py
+++ b/proposals/forms.py
@@ -125,4 +125,20 @@ class TopicForm(forms.ModelForm):
         return name
 
 
+class TrackForm(forms.ModelForm):
+    def __init__(self, *args, **kwargs):
+        self.site = kwargs.pop('site')
+        super().__init__(*args, **kwargs)
+
+    class Meta:
+        model = Track
+        fields = ['name', 'description']
+
+    def clean_name(self):
+        name = self.cleaned_data['name']
+        if self.instance and name != self.instance.name and Track.objects.filter(site=self.site, name=name).exists():
+            raise self.instance.unique_error_message(self._meta.model, ['name'])
+        return name
+
+
 ConferenceForm = modelform_factory(Conference, fields=['cfp_opening_date', 'cfp_closing_date', 'home'])
diff --git a/proposals/templates/proposals/track_form.html b/proposals/templates/proposals/track_form.html
new file mode 100644
index 0000000..21cbdcb
--- /dev/null
+++ b/proposals/templates/proposals/track_form.html
@@ -0,0 +1,23 @@
+{% extends 'base.html' %}
+
+{% load bootstrap3 i18n %}
+
+{% block topictab %} class="active"{% endblock %}
+
+{% block css %}
+{{ block.super }}
+{{ form.media.css }}
+{% endblock %}
+
+{% block content %}
+
+<h1>{% trans "Track" %}</h1>
+
+{% include "_form.html" %}
+
+{% endblock %}
+
+{% block js_end %}
+{{ block.super }}
+{{ form.media.js }}
+{% endblock %}
diff --git a/proposals/templates/proposals/track_list.html b/proposals/templates/proposals/track_list.html
index 8ad2423..dafbfa3 100644
--- a/proposals/templates/proposals/track_list.html
+++ b/proposals/templates/proposals/track_list.html
@@ -9,7 +9,7 @@
 <h1>{% trans "Tracks" %}</h1>
 
 {% if request|orga %}
-<p><a href="#" class="btn btn-success">{% trans "Add a track (not implemented)" %}</a><p>
+<p><a href="{% url 'add-track' %}" class="btn btn-success">{% trans "Add a track (not implemented)" %}</a><p>
 {% endif %}
 
 <div class="row">
@@ -20,7 +20,7 @@
     {% if request|staff %}
         <a href="{{ track.get_absolute_url }}">{{ track.talk_set.count }} {% trans "talk" %}{{ track.talk_set.count|pluralize }}</a>
         |
-        <a href="#">{% bootstrap_icon "pencil" %} (not implemented)</a>
+        <a href="{% url 'edit-track' track.slug %}">{% bootstrap_icon "pencil" %}</a>
     {% endif %}
   </div>
     {% cycle '' '<div class="clearfix visible-xs"></div>' %}
diff --git a/proposals/urls.py b/proposals/urls.py
index 39391b2..a4686ef 100644
--- a/proposals/urls.py
+++ b/proposals/urls.py
@@ -19,6 +19,8 @@ urlpatterns = [
     url(r'^topic/add/$', views.TopicCreate.as_view(), name='add-topic'),
     url(r'^topic/(?P<slug>[-\w]+)/edit/$', views.TopicUpdate.as_view(), name='edit-topic'),
     url(r'^track/$', views.TrackList.as_view(), name='list-tracks'),
+    url(r'^track/add/$', views.TrackCreate.as_view(), name='add-track'),
+    url(r'^track/(?P<slug>[-\w]+)/edit/$', views.TrackUpdate.as_view(), name='edit-track'),
     url(r'^speakers/$', views.speaker_list, name='list-speakers'),
     url(r'^speaker/(?P<username>[\w.@+-]+)$', views.user_details, name='show-speaker'),
 ]
diff --git a/proposals/views.py b/proposals/views.py
index da9dcd1..79c1dcc 100644
--- a/proposals/views.py
+++ b/proposals/views.py
@@ -21,7 +21,7 @@ from accounts.utils import is_staff, is_orga
 
 from conversations.models import ConversationWithParticipant, ConversationAboutTalk, Message
 
-from .forms import TalkForm, TopicForm, ConferenceForm, TalkFilterForm, STATUS_VALUES, SpeakerFilterForm
+from .forms import TalkForm, TopicForm, TrackForm, ConferenceForm, TalkFilterForm, STATUS_VALUES, SpeakerFilterForm
 from .models import Talk, Track, Topic, Vote, Conference
 from .signals import talk_added, talk_edited
 from .utils import allowed_talks, markdown_to_html
@@ -231,6 +231,19 @@ class TopicUpdate(OrgaRequiredMixin, TopicMixin, TopicFormMixin, UpdateView):
     pass
 
 
+class TrackFormMixin(object):
+    form_class = TrackForm
+
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        kwargs.update({'site': get_current_site(self.request)})
+        return kwargs
+
+    def form_valid(self, form):
+        form.instance.site = get_current_site(self.request)
+        return super().form_valid(form)
+
+
 class TrackMixin(object):
     def get_queryset(self):
         return Track.objects.filter(site=get_current_site(self.request)).all()
@@ -240,6 +253,14 @@ class TrackList(LoginRequiredMixin, TrackMixin, ListView):
     pass
 
 
+class TrackCreate(OrgaRequiredMixin, TrackMixin, TrackFormMixin, CreateView):
+    model = Track
+
+
+class TrackUpdate(OrgaRequiredMixin, TrackMixin, TrackFormMixin, UpdateView):
+    pass
+
+
 @login_required
 def vote(request, talk, score):
     talk = get_object_or_404(Talk, site=get_current_site(request), slug=talk)