fixed bug in welcome and added more examples

This commit is contained in:
Massimo Di Pierro
2012-04-06 09:01:35 -05:00
parent e76a918944
commit 9d33ff85ea
4 changed files with 17 additions and 8 deletions
+1 -1
View File
@@ -1 +1 @@
Version 1.99.7 (2012-04-05 22:06:40) dev
Version 1.99.7 (2012-04-06 09:01:07) dev
+3 -1
View File
@@ -44,7 +44,7 @@ auth = Auth(db, hmac_key=Auth.get_or_create_key())
crud, service, plugins = Crud(db), Service(), PluginManager()
## create all tables needed by auth if not custom tables
auth.define_tables()
auth.define_tables(username=False, signature=False)
## configure email
mail=auth.settings.mailer
@@ -79,3 +79,5 @@ use_janrain(auth,filename='private/janrain.key')
## >>> for row in rows: print row.id, row.myfield
#########################################################################
## after defining tables, uncomment below to enable auditing
# auth.enable_record_versioning(db)
+1
View File
@@ -6838,6 +6838,7 @@ class Table(dict):
:raises SyntaxError: when a supplied field is of incorrect type.
"""
self._actual = False # set to True by define_table()
self._tablename = tablename
self._sequence_name = args.get('sequence_name',None) or \
+12 -6
View File
@@ -1314,12 +1314,18 @@ class Auth(object):
db = self.db
settings = self.settings
if signature==True: signature = self.signature
elif signature==None: signature = []
if signature==True:
signature_list = [self.signature]
elif not signature:
signature_list = []
elif isinstance(signature,self.db.Table):
signature_list = [signature]
else:
signature_list = signature
if not settings.table_user_name in db.tables:
passfield = settings.password_field
extra_fields = settings.extra_fields.get(
settings.table_user_name,[])+[signature]
settings.table_user_name,[])+signature_list
if username or settings.cas_provider:
table = db.define_table(
settings.table_user_name,
@@ -1395,7 +1401,7 @@ class Auth(object):
settings.table_user = db[settings.table_user_name]
if not settings.table_group_name in db.tables:
extra_fields = settings.extra_fields.get(
settings.table_group_name,[])+[signature]
settings.table_group_name,[])+signature_list
table = db.define_table(
settings.table_group_name,
Field('role', length=512, default='',
@@ -1413,7 +1419,7 @@ class Auth(object):
settings.table_group = db[settings.table_group_name]
if not settings.table_membership_name in db.tables:
extra_fields = settings.extra_fields.get(
settings.table_membership_name,[])+[signature]
settings.table_membership_name,[])+signature_list
table = db.define_table(
settings.table_membership_name,
Field('user_id', settings.table_user,
@@ -1434,7 +1440,7 @@ class Auth(object):
settings.table_membership = db[settings.table_membership_name]
if not settings.table_permission_name in db.tables:
extra_fields = settings.extra_fields.get(
settings.table_permission_name,[])+[signature]
settings.table_permission_name,[])+signature_list
table = db.define_table(
settings.table_permission_name,
Field('group_id', settings.table_group,