Find: add public description

4 files changed, 37 insertions, 6 deletions

diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py
index 390d36c36..bd3ab9d77 100644
--- a/archaeological_finds/forms.py
+++ b/archaeological_finds/forms.py
@@ -145,11 +145,11 @@ class BaseFindForm(CustomForm, ManageOldType):
     }
     field_order = [
         'label', 'denomination', 'previous_id', 'museum_id', 'seal_number',
-        'mark', 'description', 'is_complete', 'material_type',
-        'material_type_quality', 'material_comment', 'object_type',
-        'object_type_quality', 'find_number', 'min_number_of_individuals',
-        'inscription', 'decoration', 'manufacturing_place', 'communicabilitie',
-        'comment', 'dating_comment',
+        'mark', 'description', 'public_description', 'is_complete',
+        'material_type', 'material_type_quality', 'material_comment',
+        'object_type', 'object_type_quality', 'find_number',
+        'min_number_of_individuals', 'inscription', 'decoration',
+        'manufacturing_place', 'communicabilitie', 'comment', 'dating_comment',
         'length', 'width', 'height', 'thickness', 'diameter', 'circumference',
         'volume', 'weight', 'clutter_long_side', 'clutter_short_side',
         'clutter_height', 'dimensions_comment', 'checked_type', 'check_date'
@@ -169,6 +169,8 @@ class BaseFindForm(CustomForm, ManageOldType):
     HEADERS['description'] = FormHeader(_(u"Description"))
     description = forms.CharField(label=_(u"Description"),
                                   widget=forms.Textarea, required=False)
+    public_description = forms.CharField(
+        label=_("Public description"), widget=forms.Textarea, required=False)
     is_complete = forms.NullBooleanField(label=_(u"Is complete?"),
                                          required=False)
     material_type = widgets.Select2MultipleField(
@@ -281,7 +283,8 @@ class FindForm(BaseFindForm):
     field_order = [
         'label', 'denomination', 'previous_id',
         'get_first_base_find__excavation_id', 'museum_id', 'seal_number',
-        'mark', 'description', 'get_first_base_find__discovery_date',
+        'mark', 'description', 'public_description',
+        'get_first_base_find__discovery_date',
         'get_first_base_find__discovery_date_taq', 'get_first_base_find__batch',
         'is_complete', 'material_type', 'material_type_quality',
         'material_comment', 'object_type',
diff --git a/archaeological_finds/migrations/0069_auto_20190826_1021.py b/archaeological_finds/migrations/0069_auto_20190826_1021.py
new file mode 100644
index 000000000..074d65dce
--- /dev/null
+++ b/archaeological_finds/migrations/0069_auto_20190826_1021.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.18 on 2019-08-26 10:21
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('archaeological_finds', '0068_auto_20190712_1814'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='find',
+            name='public_description',
+            field=models.TextField(blank=True, null=True, verbose_name='Public description'),
+        ),
+        migrations.AddField(
+            model_name='historicalfind',
+            name='public_description',
+            field=models.TextField(blank=True, null=True, verbose_name='Public description'),
+        ),
+    ]
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index 1a3a93dcd..cffbaf03e 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -1578,6 +1578,8 @@ class Find(BulkUpdatedItem, ValueGetter, DocumentItem, BaseHistorizedItem,
                                         null=True)
     appraisal_date = models.DateField(_(u"Appraisal date"), blank=True,
                                       null=True)
+    public_description = models.TextField(_("Public description"), blank=True,
+                                          null=True)
     documents = models.ManyToManyField(
         Document, related_name='finds', verbose_name=_(u"Documents"),
         blank=True)
diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html
index 268a31d39..f1a1affb6 100644
--- a/archaeological_finds/templates/ishtar/sheet_find.html
+++ b/archaeological_finds/templates/ishtar/sheet_find.html
@@ -143,6 +143,7 @@
       <h3>{% trans "Description" %}</h3>
       <div class='row'>
           {% field_flex_full "Description" item.description "<pre>" "</pre>" %}
+          {% field_flex_full "Public description" item.public_description "<pre>" "</pre>" %}
           {% field_flex "Is complete?" item.is_complete %}
           {% field_flex_multiple_obj "Material types" item 'material_types' %}
           {% field_flex "Material type quality" item.material_type_quality %}