summaryrefslogtreecommitdiff
path: root/ishtar_common
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2018-04-23 19:32:16 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2018-06-12 08:43:58 +0200
commit7fefd49eb981b2ddad42b879df2821949ba24e39 (patch)
treeb675302644cf00ac5f6b164258476b579e7bc2fe /ishtar_common
parente6d28b9a5e69461726a06826cbcf089dfe34f148 (diff)
downloadIshtar-7fefd49eb981b2ddad42b879df2821949ba24e39.tar.bz2
Ishtar-7fefd49eb981b2ddad42b879df2821949ba24e39.zip
Adapt migrations - M2M cannot be simply migrate (refs #4076)
Diffstat (limited to 'ishtar_common')
-rw-r--r--ishtar_common/migrations/0049_auto_20180423_1857.py20
-rw-r--r--ishtar_common/models.py2
2 files changed, 21 insertions, 1 deletions
diff --git a/ishtar_common/migrations/0049_auto_20180423_1857.py b/ishtar_common/migrations/0049_auto_20180423_1857.py
new file mode 100644
index 000000000..9934bf47f
--- /dev/null
+++ b/ishtar_common/migrations/0049_auto_20180423_1857.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.10 on 2018-04-23 18:57
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('ishtar_common', '0048_auto_20180423_1838'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='ishtarimage',
+ name='name',
+ field=models.CharField(blank=True, max_length=250, null=True, verbose_name='Name'),
+ ),
+ ]
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index 4d8243af4..3a0bb853f 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -3040,7 +3040,7 @@ class ImageType(GeneralType):
class IshtarImage(ImageModel):
- name = models.CharField(_(u"Name"), max_length=250)
+ name = models.CharField(_(u"Name"), max_length=250, blank=True, null=True)
description = models.TextField(_(u"Description"), blank=True, null=True)
licenses = models.ManyToManyField(LicenseType, verbose_name=_(u"License"),
blank=True)