diff options
| -rw-r--r-- | archaeological_context_records/forms.py | 3 | ||||
| -rw-r--r-- | archaeological_context_records/migrations/0017_auto_20180306_1121.py | 21 | ||||
| -rw-r--r-- | archaeological_context_records/models.py | 5 | ||||
| -rw-r--r-- | ishtar_common/migrations/0033_auto_20180306_1054.py | 26 | ||||
| -rw-r--r-- | ishtar_common/models.py | 2 |
5 files changed, 55 insertions, 2 deletions
diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py index 61460ab3b..6e7c3602e 100644 --- a/archaeological_context_records/forms.py +++ b/archaeological_context_records/forms.py @@ -227,7 +227,10 @@ class RecordFormGeneral(CustomForm, ManageOldType): if 'files' in kwargs: kwargs.pop('files') super(RecordFormGeneral, self).__init__(*args, **kwargs) + profile = IshtarSiteProfile.get_current_profile() self.fields['parcel'].choices = [('', '--')] + if not profile.parcel_mandatory: + self.fields['parcel'].required = False site_label = IshtarSiteProfile.get_default_site_label() self.fields['archaeological_site'].label = site_label diff --git a/archaeological_context_records/migrations/0017_auto_20180306_1121.py b/archaeological_context_records/migrations/0017_auto_20180306_1121.py new file mode 100644 index 000000000..b0334cfb3 --- /dev/null +++ b/archaeological_context_records/migrations/0017_auto_20180306_1121.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2018-03-06 11:21 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_context_records', '0016_auto_20180218_1824'), + ] + + operations = [ + migrations.AlterField( + model_name='contextrecord', + name='parcel', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='context_record', to='archaeological_operations.Parcel', verbose_name='Parcel'), + ), + ] diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index a8607c231..90c3d5563 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -260,8 +260,9 @@ class ContextRecord(BulkUpdatedItem, BaseHistorizedItem, external_id = models.TextField(_(u"External ID"), blank=True, null=True) auto_external_id = models.BooleanField( _(u"External ID is set automatically"), default=False) - parcel = models.ForeignKey(Parcel, verbose_name=_(u"Parcel"), - related_name='context_record') + parcel = models.ForeignKey( + Parcel, verbose_name=_(u"Parcel"), related_name='context_record', + blank=True, null=True) operation = models.ForeignKey(Operation, verbose_name=_(u"Operation"), related_name='context_record') archaeological_site = models.ForeignKey( diff --git a/ishtar_common/migrations/0033_auto_20180306_1054.py b/ishtar_common/migrations/0033_auto_20180306_1054.py new file mode 100644 index 000000000..e339c8250 --- /dev/null +++ b/ishtar_common/migrations/0033_auto_20180306_1054.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2018-03-06 10:54 +from __future__ import unicode_literals + +from django.db import migrations, models +import virtualtime + + +class Migration(migrations.Migration): + + dependencies = [ + ('ishtar_common', '0032_auto_20180303_1159'), + ] + + operations = [ + migrations.AddField( + model_name='ishtarsiteprofile', + name='parcel_mandatory', + field=models.BooleanField(default=True, verbose_name='Parcel are mandatory for context records'), + ), + migrations.AlterField( + model_name='administrationtask', + name='creation_date', + field=models.DateTimeField(default=virtualtime.datetime.now), + ), + ] diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 3e2cb2440..3c63162c9 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -1554,6 +1554,8 @@ class IshtarSiteProfile(models.Model, Cached): default=False) mapping = models.BooleanField(_(u"Mapping module"), default=False) underwater = models.BooleanField(_(u"Underwater module"), default=False) + parcel_mandatory = models.BooleanField( + _(u"Parcel are mandatory for context records"), default=True) homepage = models.TextField( _(u"Home page"), null=True, blank=True, help_text=_(u"Homepage of Ishtar - if not defined a default homepage " |