From 9cd70b31acf70c0df6207211efc629b95a8860d2 Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Tue, 23 Jun 2020 23:46:33 +0100 Subject: simple rename survexscansfolder to scansfolder --- core/models_survex.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'core/models_survex.py') diff --git a/core/models_survex.py b/core/models_survex.py index 75cdec8..2b99ddc 100644 --- a/core/models_survex.py +++ b/core/models_survex.py @@ -123,7 +123,7 @@ class SurvexBlock(models.Model): # begin_char = models.IntegerField() # code for where in the survex data files this block sits survexpath = models.CharField(max_length=200) # the path for the survex stations - survexscansfolder = models.ForeignKey("ScansFolder", null=True,on_delete=models.CASCADE) + scansfolder = models.ForeignKey("ScansFolder", null=True,on_delete=models.CASCADE) #refscandir = models.CharField(max_length=100) legsall = models.IntegerField(null=True) # summary data for this block @@ -211,16 +211,16 @@ class ScansFolder(models.Model): class SurvexScanSingle(models.Model): ffile = models.CharField(max_length=200) name = models.CharField(max_length=200) - survexscansfolder = models.ForeignKey("ScansFolder", null=True,on_delete=models.CASCADE) + scansfolder = models.ForeignKey("ScansFolder", null=True,on_delete=models.CASCADE) class Meta: ordering = ('name',) def get_absolute_url(self): - return urljoin(settings.URL_ROOT, reverse('surveyscansingle', kwargs={"path":re.sub("#", "%23", self.survexscansfolder.walletname), "file":self.name})) + return urljoin(settings.URL_ROOT, reverse('surveyscansingle', kwargs={"path":re.sub("#", "%23", self.scansfolder.walletname), "file":self.name})) def __str__(self): - return "Survey Scan Image: " + str(self.name) + " in " + str(self.survexscansfolder) + return "Survey Scan Image: " + str(self.name) + " in " + str(self.scansfolder) class TunnelFile(models.Model): tunnelpath = models.CharField(max_length=200) -- cgit v1.2.3