Removed long_description field

src/pretix/base/migrations/0020_auto_20151005_2119.py

@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+import pretix.base.i18n
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('pretixbase', '0019_auto_20151004_1233'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='item',
+            name='long_description',
+        ),
+        migrations.RenameField(
+            model_name='item',
+            old_name='short_description',
+            new_name='description'
+        ),
+        migrations.AlterField(
+            model_name='item',
+            name='description',
+            field=pretix.base.i18n.I18nTextField(null=True, verbose_name='Description', blank=True,
+                                                 help_text='This is shown below the product name in lists.'),
+        ),
+    ]

src/pretix/base/models.py

@@ -773,15 +773,11 @@ class Item(Versionable):
         default=True,
         verbose_name=_("Active"),
     )
-    short_description = I18nTextField(
-        verbose_name=_("Short description"),
+    description = I18nTextField(
+        verbose_name=_("Description"),
         help_text=_("This is shown below the product name in lists."),
         null=True, blank=True,
     )
-    long_description = I18nTextField(
-        verbose_name=_("Long description"),
-        null=True, blank=True,
-    )
     default_price = models.DecimalField(
         verbose_name=_("Default price"),
         max_digits=7, decimal_places=2, null=True

src/pretix/control/templates/pretixcontrol/item/index.html

@@ -10,8 +10,7 @@
 			{% bootstrap_field form.active layout="horizontal" %}
 			{% bootstrap_field form.category layout="horizontal" %}
             {% bootstrap_field form.admission layout="horizontal" %}
-			{% bootstrap_field form.short_description layout="horizontal" %}
-			{% bootstrap_field form.long_description layout="horizontal" %}
+			{% bootstrap_field form.description layout="horizontal" %}
             {% bootstrap_field form.picture layout="horizontal" %}
 		</fieldset>
 		<fieldset>

src/pretix/presale/templates/pretixpresale/event/index.html

@@ -72,7 +72,7 @@
                                         <a href="javascript:void(0);" data-toggle="variations">
                                             <strong>{{ item.name }}</strong>
                                         </a>
-                                        {% if item.short_description %}<p>{{ item.short_description }}</p>{% endif %}
+                                        {% if item.description %}<p>{{ item.description }}</p>{% endif %}
                                     </div>
                                     <div class="col-md-2 col-xs-6 price">
                                         {% if item.min_price != item.max_price %}