diff options
| -rw-r--r-- | archaeological_finds/forms.py | 6 | ||||
| -rw-r--r-- | archaeological_finds/migrations/0117_auto_20240219_1220.py | 41 | ||||
| -rw-r--r-- | archaeological_finds/models_finds.py | 1 | ||||
| -rw-r--r-- | archaeological_finds/templates/ishtar/sheet_find.html | 1 | ||||
| -rw-r--r-- | archaeological_finds/templates/ishtar/sheet_museum_find.html | 1 |
5 files changed, 41 insertions, 9 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index 44f38af87..a40278c87 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -254,7 +254,6 @@ class BasicFindForm(CustomForm, ManageOldType): "mark", "museum_inventory_marking_presence", "museum_marking_type", - "museum_marking_comment", "museum_owner_institution", "museum_custodian_institution", "museum_depositor_inventory_number", @@ -326,7 +325,6 @@ class BasicFindForm(CustomForm, ManageOldType): "museum_donor", "museum_inventory_marking_presence", "museum_marking_type", - "museum_marking_comment", "museum_collection", "museum_former_collection", "museum_inventory_entry_year", @@ -359,9 +357,6 @@ class BasicFindForm(CustomForm, ManageOldType): label=_("Type of marking"), required=False ) mark = forms.CharField(label=_("Marking details"), required=False) - museum_marking_comment = forms.CharField( - label=_("Comment on marking"), widget=forms.Textarea, required=False - ) # collection = forms.IntegerField( # label=_("Collection (warehouse)"), # widget=widgets.JQueryAutoComplete( @@ -621,7 +616,6 @@ class FindForm(BasicFindForm): "mark", "museum_inventory_marking_presence", "museum_marking_type", - "museum_marking_comment", "museum_owner_institution", "museum_custodian_institution", "museum_depositor_inventory_number", diff --git a/archaeological_finds/migrations/0117_auto_20240219_1220.py b/archaeological_finds/migrations/0117_auto_20240219_1220.py new file mode 100644 index 000000000..d7eede9a4 --- /dev/null +++ b/archaeological_finds/migrations/0117_auto_20240219_1220.py @@ -0,0 +1,41 @@ +# Generated by Django 2.2.24 on 2024-02-19 12:20 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_finds', '0116_data_migration_museum_technical'), + ] + + operations = [ + migrations.RemoveField( + model_name='find', + name='museum_marking_comment', + ), + migrations.RemoveField( + model_name='historicalfind', + name='museum_marking_comment', + ), + migrations.AlterField( + model_name='find', + name='mark', + field=models.TextField(blank=True, default='', verbose_name='Marking details'), + ), + migrations.AlterField( + model_name='find', + name='museum_id', + field=models.TextField(blank=True, default='', verbose_name='Museum inventory number'), + ), + migrations.AlterField( + model_name='historicalfind', + name='mark', + field=models.TextField(blank=True, default='', verbose_name='Marking details'), + ), + migrations.AlterField( + model_name='historicalfind', + name='museum_id', + field=models.TextField(blank=True, default='', verbose_name='Museum inventory number'), + ), + ] diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 56dcf5b0a..7bbd0863e 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -2047,7 +2047,6 @@ class Find( blank=True, related_name="finds", ) - museum_marking_comment = models.TextField(_("Comment on marking"), blank=True, default="") museum_collection = models.ForeignKey( MuseumCollection, blank=True, null=True, on_delete=models.SET_NULL, related_name='current_collection_of', diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index 98295dd65..82558629e 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -229,7 +229,6 @@ {% field_flex "Name of donor, testator or vendor" item.museum_donor %} {% field_flex_multiple_obj "Presence of inventory marking" item "museum_inventory_marking_presence" %} {% field_flex_multiple_obj "Type of marking" item "museum_marking_type" %} - {% field_flex "Comment on marking" item.museum_marking_comment %} {% field_flex "Collection" item.museum_collection %} {% field_flex_multiple_obj "Former collection" item "museum_former_collections" %} {% field_flex "Inventory entry year" item.museum_inventory_entry_year %} diff --git a/archaeological_finds/templates/ishtar/sheet_museum_find.html b/archaeological_finds/templates/ishtar/sheet_museum_find.html index a3b60f7cd..54463b90f 100644 --- a/archaeological_finds/templates/ishtar/sheet_museum_find.html +++ b/archaeological_finds/templates/ishtar/sheet_museum_find.html @@ -161,7 +161,6 @@ {% field_flex_multiple_obj "Presence of inventory marking" item "museum_inventory_marking_presence" %} {% field_flex_multiple_obj "Type of marking" item "museum_marking_type" %} {% field_flex "Marking details" item.mark "<pre>" "</pre>" %} - {% field_flex "Comment on marking" item.museum_marking_comment %} {% field_flex "Conformity with inventory" item.museum_inventory_conformity %} {% field_flex "Comment of non-conformity" item.museum_non_conformity_comment %} {% field_flex "Inventory entry year" item.museum_inventory_entry_year %} |