Merge branch '60-general-meetingdocuments-add-form' into 'master'

Resolve "General meeting documents add form: extra documents appears mandatory"

Closes #60

See merge request !90

website/committees/migrations/0006_auto_20160824_2201.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-08-24 20:01
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('committees', '0005_auto_20160813_2203'),
+    ]
+
+    operations = [
+        migrations.AlterModelManagers(
+            name='committee',
+            managers=[
+            ],
+        ),
+        migrations.AlterModelManagers(
+            name='committeemembership',
+            managers=[
+            ],
+        ),
+    ]

website/committees/migrations/0009_merge_20160907_1918.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-09-07 17:18
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('committees', '0008_auto_20160906_1015'),
+        ('committees', '0006_auto_20160824_2201'),
+    ]
+
+    operations = [
+    ]

website/committees/migrations/0010_auto_20160907_1934.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-09-07 17:34
+from __future__ import unicode_literals
+
+from django.db import migrations
+import django.db.models.manager
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('committees', '0009_merge_20160907_1918'),
+    ]
+
+    operations = [
+        migrations.AlterModelManagers(
+            name='committee',
+            managers=[
+                ('active_committees', django.db.models.manager.Manager()),
+            ],
+        ),
+    ]

website/documents/admin.py

@@ -7,6 +7,7 @@ from documents.models import GeneralMeeting, GeneralMeetingDocument
 
 class GeneralMeetingDocInline(admin.StackedInline):
     model = GeneralMeetingDocument
+    classes = ('collapse',)
 
 
 @admin.register(GeneralMeeting)

website/documents/migrations/0006_auto_20160907_1934.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-09-07 17:34
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import utils.validators
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('documents', '0005_auto_20160813_1116'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='generalmeeting',
+            name='minutes',
+            field=models.FileField(blank=True, upload_to='documents/meetings/minutes/', validators=[utils.validators.validate_file_extension]),
+        ),
+    ]

website/documents/migrations/0007_auto_20160930_1447.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-09-30 12:47
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import utils.validators
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('documents', '0006_auto_20160907_1934'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='generalmeeting',
+            name='minutes',
+            field=models.FileField(blank=True, null=True, upload_to='documents/meetings/minutes/', validators=[utils.validators.validate_file_extension]),
+        ),
+    ]

website/documents/models.py

@@ -50,6 +50,8 @@ class GeneralMeeting(models.Model):
     minutes = models.FileField(
         upload_to='documents/meetings/minutes/',
         validators=[validate_file_extension],
+        blank=True,
+        null=True,
     )
     datetime = models.DateTimeField()
     location = models.CharField(max_length=200)