diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2021-11-03 14:33:55 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2021-11-16 17:04:41 +0100 |
| commit | 1541e2419f9c85c65a8658457bc4a01a8f95bb02 (patch) | |
| tree | 7c79fd26d30a4f3bc4c650e0d0f2d5043e521b66 | |
| parent | 64bbb0f222ccdb18d20b95d9c58c8228eca22f0b (diff) | |
| download | Ishtar-1541e2419f9c85c65a8658457bc4a01a8f95bb02.tar.bz2 Ishtar-1541e2419f9c85c65a8658457bc4a01a8f95bb02.zip | |
Context record: change field order
| -rw-r--r-- | CHANGES-DEV.md | 1 | ||||
| -rw-r--r-- | archaeological_context_records/forms.py | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/CHANGES-DEV.md b/CHANGES-DEV.md index 8ada64dca..2607374c9 100644 --- a/CHANGES-DEV.md +++ b/CHANGES-DEV.md @@ -3,6 +3,7 @@ Ishtar changelog ### Features ### - Context record: bulk update relation - type +- Context record: change field order - JSON types: multi valued choices ### Bugs ### diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py index 157da64e1..c11afd1da 100644 --- a/archaeological_context_records/forms.py +++ b/archaeological_context_records/forms.py @@ -299,6 +299,7 @@ class RecordFormGeneral(CustomForm, ManageOldType): description = forms.CharField( label=_("Description"), widget=forms.Textarea, required=False ) + filling = forms.CharField(label=_("Filling"), widget=forms.Textarea, required=False) comment = forms.CharField( label=_("General comment"), widget=forms.Textarea, required=False ) @@ -525,10 +526,6 @@ class RecordFormInterpretation(CustomForm, ManageOldType, forms.Form): "activity": models.ActivityType, "identification": models.IdentificationType, } - datings_comment = forms.CharField( - label=_("Comments on dating"), required=False, widget=forms.Textarea - ) - filling = forms.CharField(label=_("Filling"), widget=forms.Textarea, required=False) interpretation = forms.CharField( label=_("Interpretation"), widget=forms.Textarea, required=False ) @@ -540,6 +537,9 @@ class RecordFormInterpretation(CustomForm, ManageOldType, forms.Form): taq_estimated = forms.IntegerField(label=_("Estimated TAQ"), required=False) tpq = forms.IntegerField(label=_("TPQ"), required=False) tpq_estimated = forms.IntegerField(label=_("Estimated TPQ"), required=False) + datings_comment = forms.CharField( + label=_("Comments on dating"), required=False, widget=forms.Textarea + ) TYPES = [ FieldType("activity", models.ActivityType), |