diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-07-14 18:37:22 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-07-14 18:37:22 +0200 |
| commit | 9aca92fb0044d9665c69e6ec36bd8bb69ef1829f (patch) | |
| tree | 05a548ef57b6e186fe907e12e4ca10526ef7eda7 /archaeological_operations/models.py | |
| parent | d2d4e159eb1df50529b32e4ada4bf3586136619c (diff) | |
| parent | a39f989e9c02bca9e4c3127fde855364f392e3a5 (diff) | |
| download | Ishtar-9aca92fb0044d9665c69e6ec36bd8bb69ef1829f.tar.bz2 Ishtar-9aca92fb0044d9665c69e6ec36bd8bb69ef1829f.zip | |
Merge branch 'v0.9' into wheezy
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): |