fixed no-email edit in profile
This commit is contained in:
Vendored
+1
-1
@@ -122,7 +122,7 @@ def deploy(appname=None, all=False):
|
|||||||
|
|
||||||
if all=='all' or not backup:
|
if all=='all' or not backup:
|
||||||
local('zip -r _update.zip * -x *~ -x .* -x \#* -x *.bak -x *.bak2')
|
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/*')
|
local('zip -r _update.zip */*.py */*/*.py views/*.html views/*/*.html static/*')
|
||||||
|
|
||||||
put('_update.zip','/tmp/_update.zip')
|
put('_update.zip','/tmp/_update.zip')
|
||||||
|
|||||||
+3
-1
@@ -443,7 +443,9 @@ class AuthAPI(object):
|
|||||||
# log messages should not be translated
|
# log messages should not be translated
|
||||||
if type(description).__name__ == 'lazyT':
|
if type(description).__name__ == 'lazyT':
|
||||||
description = description.m
|
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):
|
def id_group(self, role):
|
||||||
"""
|
"""
|
||||||
|
|||||||
+1
-1
Submodule gluon/packages/dal updated: d4d7e48c1f...6e9b87943b
@@ -3762,6 +3762,7 @@ class Auth(AuthAPI):
|
|||||||
client_side=self.settings.client_side)
|
client_side=self.settings.client_side)
|
||||||
passfield = self.settings.password_field
|
passfield = self.settings.password_field
|
||||||
table_user[passfield].writable = False
|
table_user[passfield].writable = False
|
||||||
|
table_user['email'].writable = False
|
||||||
request = current.request
|
request = current.request
|
||||||
session = current.session
|
session = current.session
|
||||||
if next is DEFAULT:
|
if next is DEFAULT:
|
||||||
@@ -3772,6 +3773,7 @@ class Auth(AuthAPI):
|
|||||||
onaccept = self.settings.profile_onaccept
|
onaccept = self.settings.profile_onaccept
|
||||||
if log is DEFAULT:
|
if log is DEFAULT:
|
||||||
log = self.messages['profile_log']
|
log = self.messages['profile_log']
|
||||||
|
|
||||||
form = SQLFORM(
|
form = SQLFORM(
|
||||||
table_user,
|
table_user,
|
||||||
self.user.id,
|
self.user.id,
|
||||||
|
|||||||
Reference in New Issue
Block a user