From de522a0035443ab93cdb93533b53c7b3f7c8b8bd Mon Sep 17 00:00:00 2001
From: Ludovic Stephan <lstephan@clipper.ens.fr>
Date: Mon, 5 Sep 2016 02:38:46 +0200
Subject: [PATCH] fixes + deprecated migration

---
 bda/forms.py                      |  6 +++--
 bda/migrations/0008_revente.py    | 38 -------------------------------
 bda/templates/liste-reventes.html |  2 +-
 3 files changed, 5 insertions(+), 41 deletions(-)
 delete mode 100644 bda/migrations/0008_revente.py

diff --git a/bda/forms.py b/bda/forms.py
index 0c886e0f..c2eec894 100644
--- a/bda/forms.py
+++ b/bda/forms.py
@@ -8,6 +8,7 @@ from datetime import timedelta
 
 from django import forms
 from django.forms.models import BaseInlineFormSet
+from django.db.models import Q
 from django.utils import timezone
 from bda.models import Attribution, Spectacle
 
@@ -67,8 +68,9 @@ class AnnulForm(forms.Form):
         self.fields['attributions'].queryset = participant.attribution_set\
             .filter(spectacle__date__gte=timezone.now(),
                     revente__isnull=False,
-                    revente__date__gte=timezone.now()-timedelta(hours=1),
-                    revente__seller=participant)
+                    revente__date__gte=timezone.now()-timedelta(hours=1))\
+            .filter(Q(revente__soldTo__isnull=True) |
+                    Q(revente__soldTo=participant))
 
 
 class InscriptionReventeForm(forms.Form):
diff --git a/bda/migrations/0008_revente.py b/bda/migrations/0008_revente.py
deleted file mode 100644
index 4db2c9de..00000000
--- a/bda/migrations/0008_revente.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-import django.utils.timezone
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('bda', '0007_extends_spectacle'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='SpectacleRevente',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('date', models.DateTimeField(default=django.utils.timezone.now, verbose_name='Date de mise en vente')),
-                ('attribution', models.OneToOneField(related_name='revente', to='bda.Attribution')),
-            ],
-        ),
-        migrations.AddField(
-            model_name='participant',
-            name='choicesrevente',
-            field=models.ManyToManyField(related_name='revente', to='bda.Spectacle', blank=True),
-        ),
-        migrations.AddField(
-            model_name='spectaclerevente',
-            name='interested',
-            field=models.ManyToManyField(related_name='wanted', to='bda.Participant', blank=True),
-        ),
-        migrations.AddField(
-            model_name='spectaclerevente',
-            name='soldTo',
-            field=models.ForeignKey(blank=True, to='bda.Participant', null=True),
-        ),
-    ]
diff --git a/bda/templates/liste-reventes.html b/bda/templates/liste-reventes.html
index 9e4acb92..1920256f 100644
--- a/bda/templates/liste-reventes.html
+++ b/bda/templates/liste-reventes.html
@@ -12,7 +12,7 @@
   {% if shotgun %}
   <br>
   <h3>Places disponibles immédiatement</h3>
-    <ul>
+    <ul class="list-unstyled">
     {% for spectacle in shotgun %}
     <li><a href="{% url "bda-buy-revente" spectacle.id %}">{{spectacle}}</a></li>
     {% endfor %}