diff --git a/core/models/survex.py b/core/models/survex.py index 30bd9bb..94c6271 100644 --- a/core/models/survex.py +++ b/core/models/survex.py @@ -180,7 +180,7 @@ class ScansFolder(models.Model): ordering = ('walletname',) def get_absolute_url(self): - return urljoin(settings.URL_ROOT, reverse('surveyscansfolder', kwargs={"path":re.sub("#", "%23", self.walletname)})) + return urljoin(settings.URL_ROOT, reverse('scanswallet', kwargs={"path":re.sub("#", "%23", self.walletname)})) def __str__(self): return str(self.walletname) + " (Survey Scans Folder)" diff --git a/core/views/surveys.py b/core/views/surveys.py index 4af5bcb..3de395f 100644 --- a/core/views/surveys.py +++ b/core/views/surveys.py @@ -20,7 +20,7 @@ need to check if inavlid query string is invalid, or produces multiple replies and render a user-friendly error page. ''' -def surveyscansfolder(request, path): +def scanswallet(request, path): #print [ s.walletname for s in ScansFolder.objects.all() ] try: scansfolder = ScansFolder.objects.get(walletname=urlunquote(path)) @@ -42,7 +42,7 @@ def scansingle(request, path, file): return render(request, 'errors/generic.html', {'message': message}) -def surveyscansfolders(request): +def scanswallets(request): manyscansfolders = ScansFolder.objects.all() return render(request, 'manyscansfolders.html', { 'manyscansfolders':manyscansfolders, 'settings': settings }) diff --git a/templates/base.html b/templates/base.html index 64ce3c6..0ae254d 100644 --- a/templates/base.html +++ b/templates/base.html @@ -31,7 +31,7 @@ Survex-204 | Survex | All Survex | - Scans | + Scans | Drawings | 290 (FGH) | 291 (GSH) | diff --git a/templates/expowebbase.html b/templates/expowebbase.html index 8d762cd..5261e8a 100644 --- a/templates/expowebbase.html +++ b/templates/expowebbase.html @@ -17,7 +17,7 @@ {% if cavepage %}