Merge branch 'Kerl/new_category' into 'master'

Kerl/new category

Le nouvel ordre des catégories est :
- Actif
- Optionnel
- À venir
- Archive

Fixes #4 

See merge request !1

partitions/migrations/0007_add_category_optional.py

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('partitions', '0006_partitionset_category_and_infos'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='partitionset',
+            name='category',
+            field=models.CharField(
+                default='incoming',
+                verbose_name='Types de partitions',
+                choices=[('active', 'Actif'), ('incoming', 'À venir'),
+                         ('old', 'Archive'), ('optional', 'Optionnel')],
+                max_length=8),
+        ),
+    ]

partitions/models.py

@@ -7,6 +7,7 @@ PARTITION_TYPES = (
     ("active", "Actif"),
     ("incoming", "À venir"),
     ("old", "Archive"),
+    ("optional", "Optionnel"),
 )
 
 

partitions/templates/partitions/liste.html

@@ -19,6 +19,13 @@
     {% endfor %}
     </ul>
 
+    <h3 class="part">Partitions optionnelles</h3>
+    <ul class="filelist">
+    {% for part in optional_partitions %}
+            {% include "partitions/liste_item.html" with part=part %}
+    {% endfor %}
+    </ul>
+
     <h3 class="part">Partitions à venir</h3>
     <ul class="filelist">
     {% for part in incoming_partitions %}

partitions/views.py

@@ -18,6 +18,7 @@ def liste(request):
     context = {
         "request": request,
         "active_partitions": partitions.filter(category="active").all(),
+        "optional_partitions": partitions.filter(category="optional").all(),
         "incoming_partitions": partitions.filter(category="incoming").all(),
         "old_partitions": partitions.filter(category="old").all()
         }