Image.type required

diff --git a/app/organization/core/migrations/0002_auto_20160824_1454.py b/app/organization/core/migrations/0002_auto_20160824_1454.py
new file mode 100644 (file)
index 0000000..84c0cd0
--- /dev/null
+++ b/app/organization/core/migrations/0002_auto_20160824_1454.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-08-24 12:54
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-core', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='displayableimage',
+            name='type',
+            field=models.CharField(choices=[('logo', 'logo'), ('slider', 'slider'), ('card', 'card'), ('content', 'content')], max_length=64, verbose_name='type'),
+        ),
+        migrations.AlterField(
+            model_name='modelimage',
+            name='type',
+            field=models.CharField(choices=[('logo', 'logo'), ('slider', 'slider'), ('card', 'card'), ('content', 'content')], max_length=64, verbose_name='type'),
+        ),
+    ]

diff --git a/app/organization/core/models.py b/app/organization/core/models.py
index e66c8ce9ae58e87aff29ddd74e9a4420fac496a0..0d5ed6d1b2db85de51c6d57521aa6ad21c2b39e3 100644 (file)
--- a/app/organization/core/models.py
+++ b/app/organization/core/models.py
@@ -85,7 +85,7 @@ class Image(Titled, Orderable):
 
     file = FileField(_("Image"), max_length=1024, format="Image", upload_to="images")
     credits = models.CharField(_('credits'), max_length=256, blank=True, null=True)
-    type = models.CharField(_('type'), max_length=64, choices=IMAGE_TYPE_CHOICES, blank=True)
+    type = models.CharField(_('type'), max_length=64, choices=IMAGE_TYPE_CHOICES)
 
     class Meta:
         abstract = True

diff --git a/app/organization/magazine/migrations/0002_auto_20160824_1454.py b/app/organization/magazine/migrations/0002_auto_20160824_1454.py
new file mode 100644 (file)
index 0000000..8930334
--- /dev/null
+++ b/app/organization/magazine/migrations/0002_auto_20160824_1454.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-08-24 12:54
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-magazine', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='articleimage',
+            name='type',
+            field=models.CharField(choices=[('logo', 'logo'), ('slider', 'slider'), ('card', 'card'), ('content', 'content')], max_length=64, verbose_name='type'),
+        ),
+    ]

diff --git a/app/organization/pages/migrations/0002_auto_20160824_1454.py b/app/organization/pages/migrations/0002_auto_20160824_1454.py
new file mode 100644 (file)
index 0000000..2c02e31
--- /dev/null
+++ b/app/organization/pages/migrations/0002_auto_20160824_1454.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-08-24 12:54
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-pages', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='pageimage',
+            name='type',
+            field=models.CharField(choices=[('logo', 'logo'), ('slider', 'slider'), ('card', 'card'), ('content', 'content')], max_length=64, verbose_name='type'),
+        ),
+    ]

diff --git a/app/templates/pages/includes/page_card.html b/app/templates/pages/includes/page_card.html
index 92b20a0dd6566a958551c15ca7ba2070a2052756..53de457b0c7174471ac15a9723adf8f10d85424f 100644 (file)
--- a/app/templates/pages/includes/page_card.html
+++ b/app/templates/pages/includes/page_card.html
@@ -1,6 +1,7 @@
 {% load mezzanine_tags %}
 <a href="{{ object.get_absolute_url }}" title="{{ object.title }}" class="page-box">
     <div class="page-box__image">
+        
         <img src="{{ MEDIA_URL }}{% thumbnail object.get_content_model.photo_card 900 400 %}" />
     </div>
     <div class="page-box__content">