xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

re-enable lookup() on survexblock objects (again)

Browse Source
This commit is contained in:
Philip Sargent 2023-03-08 18:02:00 +00:00
parent e71939fe00
commit 301fa1fce1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/models/survex.py
View File

@ -82,7 +82,7 @@ class SurvexStationLookUpManager(models.Manager):
class SurvexStation(models.Model): class SurvexStation(models.Model):
name = models.CharField(max_length=100) name = models.CharField(max_length=100)
block = models.ForeignKey("SurvexBlock", null=True, on_delete=models.SET_NULL) 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) x = models.FloatField(blank=True, null=True)
y = models.FloatField(blank=True, null=True) y = models.FloatField(blank=True, null=True)
z = models.FloatField(blank=True, null=True) z = models.FloatField(blank=True, null=True)
@ -121,7 +121,7 @@ class SurvexBlockLookUpManager(models.Manager):
blocknames = [] blocknames = []
else: else:
blocknames = name.split(".") 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: for blockname in blocknames:
block = SurvexBlock.objects.get(parent=block, name__iexact=blockname) block = SurvexBlock.objects.get(parent=block, name__iexact=blockname)
return block return block
@ -132,7 +132,7 @@ class SurvexBlock(models.Model):
Multiple anonymous survex blocks are possible within the same surfex file 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) name = models.CharField(max_length=100)
title = models.CharField(max_length=200) title = models.CharField(max_length=200)
parent = models.ForeignKey("SurvexBlock", blank=True, null=True, on_delete=models.SET_NULL) parent = models.ForeignKey("SurvexBlock", blank=True, null=True, on_delete=models.SET_NULL)