diff options
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/forms_common.py | 3 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/formset_import_match.html | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py index cc61f4da7..5ea90a8d5 100644 --- a/ishtar_common/forms_common.py +++ b/ishtar_common/forms_common.py @@ -547,7 +547,8 @@ class TargetKeyForm(forms.ModelForm): self.fields["key"].widget.attrs["readonly"] = True self.fields["key"].widget.attrs["title"] = str(instance) self.fields["value"].choices = list(instance.target.get_choices()) - self.fields["value"].choices.insert(1, (self.NULL_VALUE, _("Set to NULL"))) + if not instance.target.column.required: + self.fields["value"].choices.insert(1, (self.NULL_VALUE, _("Set to NULL"))) self.fields["key"].required = False self.fields["target"].required = False diff --git a/ishtar_common/templates/ishtar/formset_import_match.html b/ishtar_common/templates/ishtar/formset_import_match.html index 912577e76..e0a9ea765 100644 --- a/ishtar_common/templates/ishtar/formset_import_match.html +++ b/ishtar_common/templates/ishtar/formset_import_match.html @@ -5,7 +5,7 @@ {% endblock %} {% block pre_container %} <form action="." method="post">{% csrf_token %} - {% endblock %} +{% endblock %} {% block content %} <h2>{{page_name}}</h2> <p class="text-center"> |