diff --git a/fabfile.py b/fabfile.py index e4dbbe60..2a1f6018 100644 --- a/fabfile.py +++ b/fabfile.py @@ -122,7 +122,7 @@ def deploy(appname=None, all=False): if all=='all' or not backup: local('zip -r _update.zip * -x *~ -x .* -x \#* -x *.bak -x *.bak2') - else: + else: local('zip -r _update.zip */*.py */*/*.py views/*.html views/*/*.html static/*') put('_update.zip','/tmp/_update.zip') diff --git a/gluon/authapi.py b/gluon/authapi.py index db2ae13f..50e30db9 100644 --- a/gluon/authapi.py +++ b/gluon/authapi.py @@ -443,7 +443,9 @@ class AuthAPI(object): # log messages should not be translated if type(description).__name__ == 'lazyT': description = description.m - self.table_event().insert(description=str(description % vars), origin=origin, user_id=user_id) + if self.table_user()[user_id]: + self.table_event().insert( + description=str(description % vars), origin=origin, user_id=user_id) def id_group(self, role): """ diff --git a/gluon/packages/dal b/gluon/packages/dal index d4d7e48c..6e9b8794 160000 --- a/gluon/packages/dal +++ b/gluon/packages/dal @@ -1 +1 @@ -Subproject commit d4d7e48c1f82a0b2a27b7475f18ee9f92e3cb0fe +Subproject commit 6e9b87943bb5162b51d085904845558a1b690812 diff --git a/gluon/tools.py b/gluon/tools.py index 753408aa..656917e3 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -3762,6 +3762,7 @@ class Auth(AuthAPI): client_side=self.settings.client_side) passfield = self.settings.password_field table_user[passfield].writable = False + table_user['email'].writable = False request = current.request session = current.session if next is DEFAULT: @@ -3772,6 +3773,7 @@ class Auth(AuthAPI): onaccept = self.settings.profile_onaccept if log is DEFAULT: log = self.messages['profile_log'] + form = SQLFORM( table_user, self.user.id,