summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2019-02-14 06:07:21 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2019-04-24 19:38:56 +0200
commitf316262066c53127323594d01d0181824d45ded4 (patch)
tree562aaad0605821ca926e031874a499cf2098ef28
parent93b6c652fc6b6497e89a2b1d2b5a125874284983 (diff)
downloadIshtar-f316262066c53127323594d01d0181824d45ded4.tar.bz2
Ishtar-f316262066c53127323594d01d0181824d45ded4.zip
GIS forms: fix spatial ref field
-rw-r--r--archaeological_context_records/forms.py7
-rw-r--r--archaeological_operations/forms.py6
2 files changed, 10 insertions, 3 deletions
diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py
index 2fb158654..b9fbfac69 100644
--- a/archaeological_context_records/forms.py
+++ b/archaeological_context_records/forms.py
@@ -28,7 +28,8 @@ from django.core import validators
from django.forms.formsets import formset_factory
from django.utils.translation import ugettext_lazy as _
-from ishtar_common.models import valid_id, IshtarSiteProfile, Town
+from ishtar_common.models import valid_id, IshtarSiteProfile, Town, \
+ SpatialReferenceSystem
from archaeological_context_records import models
from ishtar_common.forms import FinalForm, FormSet, \
@@ -145,6 +146,7 @@ class RecordFormGeneral(CustomForm, ManageOldType):
'archaeological_site': ArchaeologicalSite,
'parcel': Parcel, 'unit': models.Unit, 'town': Town,
'documentation': models.DocumentationType,
+ 'spatial_reference_system': SpatialReferenceSystem,
'excavation_technic': models.ExcavationTechnicType}
pk = forms.IntegerField(required=False, widget=forms.HiddenInput)
operation_id = forms.IntegerField(widget=forms.HiddenInput)
@@ -199,7 +201,8 @@ class RecordFormGeneral(CustomForm, ManageOldType):
TYPES = [
FieldType('unit', models.Unit),
FieldType('excavation_technic', models.ExcavationTechnicType),
- FieldType('documentation', models.DocumentationType, is_multiple=True)
+ FieldType('documentation', models.DocumentationType, is_multiple=True),
+ FieldType('spatial_reference_system', SpatialReferenceSystem),
]
PROFILE_FILTER = {
diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py
index 3a3c7a4da..854c30e18 100644
--- a/archaeological_operations/forms.py
+++ b/archaeological_operations/forms.py
@@ -754,7 +754,8 @@ class OperationFormGeneral(CustomForm, ManageOldType):
'operator': Organization,
'operation_type': models.OperationType,
'record_quality_type': models.RecordQualityType,
- 'report_processing': models.ReportState
+ 'report_processing': models.ReportState,
+ 'spatial_reference_system': SpatialReferenceSystem,
}
pk = forms.IntegerField(required=False, widget=forms.HiddenInput)
code_patriarche = forms.CharField(label=u"Code PATRIARCHE",
@@ -896,6 +897,7 @@ class OperationFormGeneral(CustomForm, ManageOldType):
FieldType('operation_type', models.OperationType),
FieldType('record_quality_type', models.RecordQualityType),
FieldType('report_processing', models.ReportState),
+ FieldType('spatial_reference_system', SpatialReferenceSystem),
]
def __init__(self, *args, **kwargs):
@@ -1211,6 +1213,7 @@ class ArchaeologicalSiteForm(ManageOldType):
TYPES = [
FieldType('periods', models.Period, True),
FieldType('remains', models.RemainType, True),
+ FieldType('spatial_reference_system', SpatialReferenceSystem),
]
def __init__(self, *args, **kwargs):
@@ -1384,6 +1387,7 @@ class SiteForm(CustomForm, ManageOldType):
form_admin_name = _(u"Archaeological site - 010 - General")
form_slug = u"archaeological_site-010-general"
associated_models = {'period': models.Period, 'remain': models.RemainType,
+ 'spatial_reference_system': SpatialReferenceSystem,
'collaborator': Person}
base_models = ["period", "remain", "collaborator"]