Edit caves in the same parent URL as the final file

This commit is contained in:
Martin Green
2022-07-31 17:08:28 +02:00
parent 91568b7151
commit 94252a94fe
4 changed files with 10 additions and 7 deletions

View File

@@ -145,6 +145,9 @@ class Cave(TroggleModel):
#return settings.URL_ROOT + '/cave/' + href + '/'
#return urljoin(settings.URL_ROOT, reverse('cave',kwargs={'cave_id':href,})) # WRONG. This produces /cave/161 and should be /1623/161
return Path(settings.URL_ROOT) / self.url # not good Django style.. NEEDS actual URL
def url_parent(self):
return self.url.rsplit("/", 1)[0]
def __str__(self, sep = ": "):
return str(self.slug())

View File

@@ -294,7 +294,7 @@ def caveEntrance(request, slug):
return render(request,'cave_entrances.html', {'cave': cave})
@login_required_if_public
def edit_cave(request, slug=None):
def edit_cave(request, path = "", slug=None):
'''This is the form that edits all the cave data and writes out an XML file in the :expoweb: repo folder
The format for the file being saved is in templates/dataformat/cave.xml