mirror of
https://expo.survex.com/repositories/troggle/.git
synced 2024-11-26 01:01:53 +00:00
merging correct urls.py for /troggle dir in
This commit is contained in:
commit
64e5e9d45c
@ -122,7 +122,6 @@ def LoadCaveTab():
|
||||
addToDefaultArgs(header,"description_file")
|
||||
break
|
||||
|
||||
|
||||
#The following checks if this cave is non-public i.e. we don't have rights to display it online.
|
||||
#Noinfo was the name of the old password protected directory, so if it has that then we will
|
||||
#set the non_public field of the model instance to true.
|
||||
@ -228,6 +227,7 @@ def LoadCaveTab():
|
||||
newCaveAndEntrance.save()
|
||||
|
||||
logging.info("Added CaveAndEntrance "+str(newCaveAndEntrance)+"\n")
|
||||
if line[AutogenFile] != "":
|
||||
f = flatpages.models.EntranceRedirect(originalURL = line[AutogenFile], entrance = newEntrance)
|
||||
f.save()
|
||||
|
||||
|
2
urls.py
2
urls.py
@ -17,7 +17,7 @@ admin.autodiscover()
|
||||
|
||||
actualurlpatterns = patterns('',
|
||||
|
||||
url(r'^$', views_other.frontpage, name="frontpage"),
|
||||
url(r'^troggle$', views_other.frontpage, name="frontpage"),
|
||||
url(r'^todo/$', views_other.todo, name="todo"),
|
||||
|
||||
url(r'^caves/?$', views_caves.caveindex, name="caveindex"),
|
||||
|
Loading…
Reference in New Issue
Block a user