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_context_records/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_context_records/models.py')
| -rw-r--r-- | archaeological_context_records/models.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index ddd9c8609..38c65a24a 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -99,7 +99,7 @@ class IdentificationType(GeneralType): class Meta: verbose_name = _(u"Identification Type") verbose_name_plural = _(u"Identification Types") - ordering = ('order',) + ordering = ('order', 'label') def __unicode__(self): return self.label @@ -165,6 +165,8 @@ class ContextRecord(BaseHistorizedItem, OwnPerms, ShortMenuItem): verbose_name=_(u"Activity"),) related_context_records = models.ManyToManyField( 'ContextRecord', through='RecordRelations', blank=True, null=True) + point = models.PointField(_(u"Point"), blank=True, null=True, dim=3) + polygon = models.PolygonField(_(u"Polygon"), blank=True, null=True) history = HistoricalRecords() class Meta: @@ -313,6 +315,7 @@ post_delete.connect(post_delete_record_relation, sender=RecordRelations) class ContextRecordSource(Source): SHOW_URL = 'show-contextrecordsource' + MODIFY_URL = 'record_source_modify' class Meta: verbose_name = _(u"Context record documentation") |