Merge pull request #1819 from normanjaeckel/Attachment

Fixed mediafile model. Fixed #1808.

openslides/mediafiles/migrations/0002_auto_20160110_0103.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mediafiles', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='mediafile',
+            name='title',
+            field=models.CharField(max_length=255, unique=True),
+        ),
+    ]

openslides/mediafiles/models.py

@@ -18,7 +18,7 @@ class Mediafile(RESTModelMixin, models.Model):
     for more information.
     """
 
-    title = models.CharField(max_length=255, unique=True, blank=True)
+    title = models.CharField(max_length=255, unique=True)
     """A string representing the title of the file."""
 
     uploader = models.ForeignKey(

openslides/mediafiles/static/templates/mediafiles/mediafile-form.html

@@ -27,7 +27,6 @@
     </div>
 
     <span ng-show="mediafile.mediafile.result">Upload Successful</span>
-    <span class="err" ng-show="errorMsg">{{ errorMsg }}</span>
 
     <i ng-show="mediafile.file.$error.required">*required</i><br>
     <i ng-show="mediafile.file.$error.maxSize">File too large