summaryrefslogtreecommitdiffstats
path: root/core/models/survex.py
diff options
context:
space:
mode:
authorPhilip Sargent <philip.sargent@gmail.com>2023-03-08 18:02:00 +0000
committerPhilip Sargent <philip.sargent@gmail.com>2023-03-08 18:02:00 +0000
commit301fa1fce18a578fbef23a09a758dda0c6ba35a9 (patch)
tree2f41d716828bfe95cbc7ddd590af22fc9c962e77 /core/models/survex.py
parente71939fe00598586de508d26f360a1fe0f51f740 (diff)
downloadtroggle-301fa1fce18a578fbef23a09a758dda0c6ba35a9.tar.gz
troggle-301fa1fce18a578fbef23a09a758dda0c6ba35a9.tar.bz2
troggle-301fa1fce18a578fbef23a09a758dda0c6ba35a9.zip
re-enable lookup() on survexblock objects (again)
Diffstat (limited to 'core/models/survex.py')
-rw-r--r--core/models/survex.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/models/survex.py b/core/models/survex.py
index 6c63034..6a0a357 100644
--- a/core/models/survex.py
+++ b/core/models/survex.py
@@ -82,7 +82,7 @@ class SurvexStationLookUpManager(models.Manager):
class SurvexStation(models.Model):
name = models.CharField(max_length=100)
block = models.ForeignKey("SurvexBlock", null=True, on_delete=models.SET_NULL)
- objects = SurvexStationLookUpManager() # overwrites SurvexStation.objects
+ objects = SurvexStationLookUpManager() # overwrites SurvexStation.objects and enables lookup()
x = models.FloatField(blank=True, null=True)
y = models.FloatField(blank=True, null=True)
z = models.FloatField(blank=True, null=True)
@@ -121,7 +121,7 @@ class SurvexBlockLookUpManager(models.Manager):
blocknames = []
else:
blocknames = name.split(".")
- # block = SurvexBlock.objects.get(parent=None, survexfile__path=settings.SURVEX_TOPNAME)
+ block = SurvexBlock.objects.get(parent=None, survexfile__path=settings.SURVEX_TOPNAME)
for blockname in blocknames:
block = SurvexBlock.objects.get(parent=block, name__iexact=blockname)
return block
@@ -132,7 +132,7 @@ class SurvexBlock(models.Model):
Multiple anonymous survex blocks are possible within the same surfex file
"""
- # objects = SurvexBlockLookUpManager()
+ objects = SurvexBlockLookUpManager() # overwrites SurvexBlock.objects and enables lookup()
name = models.CharField(max_length=100)
title = models.CharField(max_length=200)
parent = models.ForeignKey("SurvexBlock", blank=True, null=True, on_delete=models.SET_NULL)