xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

Add odt and ods mime types to our list.

Browse Source 
Maybe this should just be read in from the real list...
This commit is contained in:
Wookey 2011-07-12 00:57:48 +01:00
parent 9e5e636d0d
commit f60c4cba23
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flatpages/views.py
View File

@ -84,6 +84,8 @@ def getmimetype(path):
if path.endswith(".3d"): return "application/x-survex-3d" if path.endswith(".3d"): return "application/x-survex-3d"
if path.endswith(".pos"): return "application/x-survex-pos" if path.endswith(".pos"): return "application/x-survex-pos"
if path.endswith(".err"): return "application/x-survex-err" if path.endswith(".err"): return "application/x-survex-err"
if path.endswith(".odt"): return "application/vnd.oasis.opendocument.text"
if path.endswith(".ods"): return "application/vnd.oasis.opendocument.spreadsheet"
return "" return ""
@login_required_if_public @login_required_if_public

2
parsers/cavetab.py
View File

@ -122,6 +122,7 @@ def LoadCaveTab():
addToDefaultArgs(header,"description_file") addToDefaultArgs(header,"description_file")
break break
#The following checks if this cave is non-public i.e. we don't have rights to display it online. #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 #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. #set the non_public field of the model instance to true.
@ -227,7 +228,6 @@ def LoadCaveTab():
newCaveAndEntrance.save() newCaveAndEntrance.save()
logging.info("Added CaveAndEntrance "+str(newCaveAndEntrance)+"\n") logging.info("Added CaveAndEntrance "+str(newCaveAndEntrance)+"\n")
if line[AutogenFile] != "":
f = flatpages.models.EntranceRedirect(originalURL = line[AutogenFile], entrance = newEntrance) f = flatpages.models.EntranceRedirect(originalURL = line[AutogenFile], entrance = newEntrance)
f.save() f.save()

2
urls.py
View File

@ -17,7 +17,7 @@ admin.autodiscover()
actualurlpatterns = patterns('', actualurlpatterns = patterns('',
url(r'^troggle$', views_other.frontpage, name="frontpage"), url(r'^$', views_other.frontpage, name="frontpage"),
url(r'^todo/$', views_other.todo, name="todo"), url(r'^todo/$', views_other.todo, name="todo"),
url(r'^caves/?$', views_caves.caveindex, name="caveindex"), url(r'^caves/?$', views_caves.caveindex, name="caveindex"),