Massimo et. al.,
Can we update plugin_wiki to use the auth settings for auth table names?
Since i have not looked into implementing table namespaces on GAE yet,
i rename all my tables with an application prefix so applications don't
mix data. when i do that plugin_wiki is not so happy.
I don't think there is a source repository for plugin_wiki, so the
attached diff is based off of a download from web2py on Thursday Sept 30.
Thanks,
Christian
diff -r c9821604e151 web2py/applications/test/models/plugin_wiki.py
--- a/web2py/applications/test/models/plugin_wiki.py Fri Oct 01 13:19:23
2010 -0700
+++ b/web2py/applications/test/models/plugin_wiki.py Mon Oct 04 12:09:00
2010 -0700
@@ -53,17 +53,17 @@
Field('active','boolean',default=True),
Field('public','boolean',default=True),
Field('body','text',default=''),
- Field('role',db.auth_group,
-
requires=IS_EMPTY_OR(IS_IN_DB(db,'auth_group.id','%(role)s'))),
+ Field('role',auth.settings.table_group,
+
requires=IS_EMPTY_OR(IS_IN_DB(db,'%s.id'%auth.settings.table_group_name,'%(role)s'))),
Field('changelog',default=''),
Field('created_by',
- db.auth_user,default=auth.user_id,
+ auth.settings.table_user,default=auth.user_id,
writable=False,readable=False),
Field('created_on','datetime',
default=request.now,
writable=False,readable=False),
Field('modified_by',
- db.auth_user,default=auth.user_id,update=auth.user_id,
+
auth.settings.table_user,default=auth.user_id,update=auth.user_id,
writable=False,readable=False),
Field('modified_on','datetime',
default=request.now,update=request.now,
@@ -83,13 +83,13 @@
Field('name',requires=IS_NOT_EMPTY()),
Field('file','upload',requires=IS_NOT_EMPTY(),autodelete=True),
Field('created_by',
- db.auth_user,default=auth.user_id or 1,
+ auth.settings.table_user,default=auth.user_id or 1,
writable=False,readable=False),
Field('created_on','datetime',
default=request.now,
writable=False,readable=False),
Field('modified_by',
- db.auth_user,default=auth.user_id,update=auth.user_id,
+
auth.settings.table_user,default=auth.user_id,update=auth.user_id,
writable=False,readable=False),
Field('modified_on','datetime',
default=request.now,update=request.now,
@@ -103,7 +103,7 @@
Field('record_id','integer',
writable=False,readable=False),
Field('body',requires=IS_NOT_EMPTY(),label='Your comment'),
- Field('created_by',db.auth_user,default=auth.user_id,
+
Field('created_by',auth.settings.table_user,default=auth.user_id,
readable=False,writable=False),
Field('created_on','datetime',default=request.now,
readable=False,writable=False),
migrate=plugin_wiki_migrate)
@@ -112,7 +112,7 @@
db.define_table('plugin_wiki_tag',
Field('name',requires=IS_NOT_IN_DB(db,'plugin_wiki_tag.name')),
Field('links','integer',default=0,writable=False),
- Field('created_by',db.auth_user,writable=False,readable=False,
+
Field('created_by',auth.settings.table_user,writable=False,readable=False,
default=auth.user_id),
Field('created_on','datetime',
default=request.now,writable=False,readable=False),
@@ -433,7 +433,7 @@
@staticmethod
def
map(key='ABQIAAAAT5em2PdsvF3z5onQpCqv0RTpH3CbXHjuCVmaTc5MkkU4wO1RRhQHEAKj2S9L72lEMpvNxzLVfJt6cg',
- table='auth_user', width=400, height=200):
+ table=auth.settings.table_user_name, width=400, height=200):
"""
## Embeds a Google map
Gets points on the map from a table
