dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wiki file should be filename, thanks David

Browse Source
This commit is contained in:
mdipierro
2012-09-15 13:41:24 -05:00
parent b52cf468af
commit 8960f91c7b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.0.9 (2012-09-14 21:16:55) stable Version 2.0.9 (2012-09-15 13:41:21) stable
gluon/tools.py
+3 -3
View File
@@ -4580,7 +4580,7 @@ class Wiki(object):
'args':[ 'args':[
Field('wiki_page','reference wiki_page'), Field('wiki_page','reference wiki_page'),
Field('title',required=True), Field('title',required=True),
Field('file','upload',required=True), Field('filename','upload',required=True),
auth.signature], auth.signature],
'vars':{'format':'%(title)s'}} 'vars':{'format':'%(title)s'}}
} }
@@ -4754,7 +4754,7 @@ class Wiki(object):
self.auth.db.wiki_media.id.represent = lambda id,row:\ self.auth.db.wiki_media.id.represent = lambda id,row:\
SPAN('@////%i/%s.%s' % \ SPAN('@////%i/%s.%s' % \
(id,IS_SLUG.urlify(row.title.split('.')[0]), (id,IS_SLUG.urlify(row.title.split('.')[0]),
row.file.split('.')[-1])) row.filename.split('.')[-1]))
self.auth.db.wiki_media.wiki_page.default = page.id self.auth.db.wiki_media.wiki_page.default = page.id
self.auth.db.wiki_media.wiki_page.writable = False self.auth.db.wiki_media.wiki_page.writable = False
content = SQLFORM.grid( content = SQLFORM.grid(
@@ -4799,7 +4799,7 @@ class Wiki(object):
if self.manage_permissions: if self.manage_permissions:
page = db.wiki_page(media.wiki_page) page = db.wiki_page(media.wiki_page)
if not self.can_read(page): return self.not_authorized(page) if not self.can_read(page): return self.not_authorized(page)
request.args = [media.file] request.args = [media.filename]
return current.response.download(request,db) return current.response.download(request,db)
else: else:
raise HTTP(404) raise HTTP(404)