diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-07-14 18:22:26 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-07-14 18:22:26 +0200 |
| commit | 44d4e1a733511c027e6381aaf88fd6f445d3659d (patch) | |
| tree | 49679dad3824d35b976ec987ef54f8552d591dd8 /archaeological_operations/models.py | |
| parent | e79f877d5110283524c8f4c144c53bc0c83459bb (diff) | |
| parent | 7db4ca0a344c2e2890170f3fd08c961f7da9da44 (diff) | |
| download | Ishtar-44d4e1a733511c027e6381aaf88fd6f445d3659d.tar.bz2 Ishtar-44d4e1a733511c027e6381aaf88fd6f445d3659d.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'archaeological_operations/models.py')
| -rw-r--r-- | archaeological_operations/models.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index 6ae05ca30..ab6b3abac 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -231,6 +231,9 @@ class Operation(BaseHistorizedItem, OwnPerms, ValueGetter, ShortMenuItem, _(u"Record quality"), max_length=2, null=True, blank=True, choices=QUALITY) abstract = models.TextField(_(u"Abstract"), null=True, blank=True) + point = models.PointField(_(u"Point"), blank=True, null=True) + multi_polygon = models.MultiPolygonField(_(u"Multi polygon"), blank=True, + null=True) history = HistoricalRecords() class Meta: @@ -514,9 +517,10 @@ class OperationSource(Source): related_name="source") index = models.IntegerField(verbose_name=_(u"Index"), blank=True, null=True) - TABLE_COLS = ['operation.year', 'operation.operation_code'] + \ + TABLE_COLS = ['operation.year', 'operation.operation_code', 'index'] + \ Source.TABLE_COLS SHOW_URL = 'show-operationsource' + MODIFY_URL = 'operation_source_modify' @property def owner(self): |