From b0fb188e24b7e11bb018b1b8803c6b898c2486e0 Mon Sep 17 00:00:00 2001
From: Grizzly <grisel-davy@crans.org>
Date: Fri, 16 Aug 2019 14:13:20 +0000
Subject: [PATCH] =?UTF-8?q?menu=20deroulant=20et=20migrations=20supprim?=
 =?UTF-8?q?=C3=A9e=20oubli=C3=A9e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/base.html                           |  2 +-
 ...0008_remove_preferences_publish_tickets.py | 48 -------------------
 2 files changed, 1 insertion(+), 49 deletions(-)
 delete mode 100644 tickets/migrations/0001_squashed_0008_remove_preferences_publish_tickets.py

diff --git a/templates/base.html b/templates/base.html
index de6f308c..7a2074f2 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -130,7 +130,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                     </ul>
                     <ul class="nav navbar-nav navbar-right">
                         <li class="dropdown">
-                            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><i class="fa fa-info"></i> {% trans "More information" %}<span class="caret"></span></a>
+                            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><i class="fa fa-info"></i> {% trans "Information and contact" %}<span class="caret"></span></a>
                             <ul class="dropdown-menu">
                                 <li><a href="{% url 'about' %}"><i class="fa fa-info-circle"></i> {% trans "About" %}</a></li>
                                 <li><a href="{% url 'contact' %}"><i class="fa fa-at"></i> {% trans "Contact" %}</a></li>
diff --git a/tickets/migrations/0001_squashed_0008_remove_preferences_publish_tickets.py b/tickets/migrations/0001_squashed_0008_remove_preferences_publish_tickets.py
deleted file mode 100644
index 2b42726e..00000000
--- a/tickets/migrations/0001_squashed_0008_remove_preferences_publish_tickets.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10.7 on 2019-08-13 12:55
-from __future__ import unicode_literals
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    replaces = [('tickets', '0001_initial'), ('tickets', '0002_auto_20190710_0952'), ('tickets', '0003_ticket_email'), ('tickets', '0004_auto_20190712_1205'), ('tickets', '0005_auto_20190712_1209'), ('tickets', '0006_preferences'), ('tickets', '0007_preferences_publish_tickets'), ('tickets', '0008_remove_preferences_publish_tickets')]
-
-    initial = True
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Ticket',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('title', models.CharField(help_text='Nom du ticket', max_length=255)),
-                ('description', models.TextField(help_text='Description du ticket', max_length=3000)),
-                ('date', models.DateTimeField(auto_now_add=True)),
-                ('solved', models.BooleanField(default=False)),
-                ('assigned_staff', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='tickets_assigned', to=settings.AUTH_USER_MODEL)),
-                ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='tickets', to=settings.AUTH_USER_MODEL)),
-                ('email', models.EmailField(help_text='Une adresse mail pour vous recontacter', max_length=100, null=True)),
-            ],
-            options={
-                'verbose_name_plural': 'Tickets',
-                'verbose_name': 'Ticket',
-            },
-        ),
-        migrations.CreateModel(
-            name='Preferences',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('publish_address', models.EmailField(help_text='Adresse mail pour annoncer les nouveau tickets (laisser vide pour ne rien annoncer)', max_length=1000, null=True)),
-            ],
-            options={
-                'verbose_name': 'Préférences des tickets',
-            },
-        ),
-    ]