diff --git a/Makefile b/Makefile index ef3aadc1..ccb5f5c7 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ update: echo "remember that pymysql was tweaked" src: ### Use semantic versioning - echo 'Version 2.4.1-alpha.1+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION + echo 'Version 2.4.1-alpha.2+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION ### rm -f all junk files make clean ### clean up baisc apps diff --git a/VERSION b/VERSION index 299393e7..525721d7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.4.1-alpha.1+timestamp.2012.12.24.14.03.22 +Version 2.4.1-alpha.2+timestamp.2012.12.24.16.13.22 diff --git a/applications/examples/views/default/examples.html b/applications/examples/views/default/examples.html index 99d6575c..883e6f25 100644 --- a/applications/examples/views/default/examples.html +++ b/applications/examples/views/default/examples.html @@ -368,7 +368,7 @@ db.define_table( db.define_table( 'product', - Field('seller_id',db_person), + Field('seller_id',db.person), Field('name'), Field('description', 'text'), Field('picture', 'upload', default=''), @@ -383,9 +383,7 @@ db.define_table( Field('quantity', 'integer'), format = '%(quantity)s %(product_id)s -> %(buyer_id)s') -purchased = \ - (db.person.id==db.purchase.buyer_id)&\ - (db.product.id==db.purchase.product_id) +purchased = (db.person.id==db.purchase.buyer_id)&(db.product.id==db.purchase.product_id) db.person.name.requires = IS_NOT_EMPTY() db.person.email.requires = [IS_EMAIL(), IS_NOT_IN_DB(db, 'person.email')] diff --git a/web2py_src.zip b/web2py_src.zip index 7eefd36a..2abab609 100644 Binary files a/web2py_src.zip and b/web2py_src.zip differ diff --git a/web2py_src_old.zip b/web2py_src_old.zip index c6d0cd6c..7eefd36a 100644 Binary files a/web2py_src_old.zip and b/web2py_src_old.zip differ