From 8960f91c7b4b2ea5b08af80c693d8ba1e2a867c9 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sat, 15 Sep 2012 13:41:24 -0500 Subject: [PATCH] wiki file should be filename, thanks David --- VERSION | 2 +- gluon/tools.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index ec6a019f..127761cc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-14 21:16:55) stable +Version 2.0.9 (2012-09-15 13:41:21) stable diff --git a/gluon/tools.py b/gluon/tools.py index dbfb16d8..c93e9749 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -4580,7 +4580,7 @@ class Wiki(object): 'args':[ Field('wiki_page','reference wiki_page'), Field('title',required=True), - Field('file','upload',required=True), + Field('filename','upload',required=True), auth.signature], 'vars':{'format':'%(title)s'}} } @@ -4754,7 +4754,7 @@ class Wiki(object): self.auth.db.wiki_media.id.represent = lambda id,row:\ SPAN('@////%i/%s.%s' % \ (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.writable = False content = SQLFORM.grid( @@ -4799,7 +4799,7 @@ class Wiki(object): if self.manage_permissions: page = db.wiki_page(media.wiki_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) else: raise HTTP(404)