From 683f8ebdc7dfd9b7305c2e07862828d3a6fed553 Mon Sep 17 00:00:00 2001 From: Massimo Date: Thu, 10 Jan 2013 14:54:21 -0600 Subject: [PATCH] changed pages grid in auth.wiki --- VERSION | 2 +- gluon/tools.py | 17 +++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/VERSION b/VERSION index 0fc639e9..b2aa09b2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.4.1-alpha.2+timestamp.2013.01.10.14.29.15 +Version 2.4.1-alpha.2+timestamp.2013.01.10.14.53.47 diff --git a/gluon/tools.py b/gluon/tools.py index de570913..2be50b3b 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -4761,7 +4761,7 @@ class Wiki(object): Field('slug', requires=[IS_SLUG(), IS_NOT_IN_DB(db, 'wiki_page.slug')], - readable=False, writable=False), + writable=False), Field('title', unique=True), Field('body', 'text', notnull=True), Field('tags', 'list:string'), @@ -5088,21 +5088,26 @@ class Wiki(object): def pages(self): if not self.can_manage(): return self.not_authorized() - self.auth.db.wiki_page.id.represent = lambda id, row: SPAN( - '@////%s' % row.slug) + self.auth.db.wiki_page.slug.represent = lambda slug, row: SPAN( + '@////%s' % slug) self.auth.db.wiki_page.title.represent = lambda title, row: \ A(title, _href=URL(args=row.slug)) + wiki_table = self.auth.db.wiki_page content = SQLFORM.grid( - self.auth.db.wiki_page, + wiki_table, + fields = [wiki_table.slug, + wiki_table.title, wiki_table.tags, + wiki_table.can_read, wiki_table.can_edit], links=[ lambda row: - A('edit', _href=URL(args=('_edit', row.slug))), + A('edit', _href=URL(args=('_edit', row.slug)),_class='btn'), lambda row: - A('media', _href=URL(args=('_editmedia', row.slug)))], + A('media', _href=URL(args=('_editmedia', row.slug)),_class='btn')], details=False, editable=False, deletable=False, create=False, orderby=self.auth.db.wiki_page.title, args=['_pages'], user_signature=False) + return dict(content=content) def media(self, id):