rename scansfolder to wallet

1 files changed, 7 insertions, 7 deletions

diff --git a/core/models/survex.py b/core/models/survex.py
index 6d662e9..b30f231 100644
--- a/core/models/survex.py
+++ b/core/models/survex.py
@@ -114,7 +114,7 @@ class SurvexBlock(models.Model):
     survexfile = models.ForeignKey("SurvexFile", blank=True, null=True,on_delete=models.SET_NULL)
     survexpath = models.CharField(max_length=200)   # the path for the survex stations
     
-    scansfolder = models.ForeignKey("Wallet", null=True,on_delete=models.SET_NULL)  
+    scanswallet = models.ForeignKey("Wallet", null=True,on_delete=models.SET_NULL)  
     
     legsall   = models.IntegerField(null=True)  # summary data for this block
     legslength = models.FloatField(null=True)
@@ -180,24 +180,24 @@ class Wallet(models.Model):
         ordering = ('walletname',)
     
     def get_absolute_url(self):
-        return urljoin(settings.URL_ROOT, reverse('scanswallet', kwargs={"path":re.sub("#", "%23", self.walletname)}))
+        return urljoin(settings.URL_ROOT, reverse('singlewallet', kwargs={"path":re.sub("#", "%23", self.walletname)}))
 
     def __str__(self):
         return str(self.walletname) + " (Survey Scans Folder)"
 
 class SingleScan(models.Model):
-    ffile         = models.CharField(max_length=200)
-    name          = models.CharField(max_length=200)
-    scansfolder   = models.ForeignKey("Wallet", null=True,on_delete=models.SET_NULL)
+    ffile    = models.CharField(max_length=200)
+    name     = models.CharField(max_length=200)
+    wallet   = models.ForeignKey("Wallet", null=True,on_delete=models.SET_NULL)
     
     class Meta:
         ordering = ('name',)
     
     def get_absolute_url(self):
-        return urljoin(settings.URL_ROOT, reverse('scansingle', kwargs={"path":re.sub("#", "%23", self.scansfolder.walletname), "file":self.name}))
+        return urljoin(settings.URL_ROOT, reverse('scansingle', kwargs={"path":re.sub("#", "%23", self.wallet.walletname), "file":self.name}))
  
     def __str__(self):
-        return "Survey Scan Image: " + str(self.name) + " in " + str(self.scansfolder)
+        return "Survey Scan Image: " + str(self.name) + " in " + str(self.wallet)
 
 class DrawingFile(models.Model):
     dwgpath          = models.CharField(max_length=200)