Merge pull request #1640 from leonelcamara/i1628better

Fixes #1628
This commit is contained in:
mdipierro authored and GitHub committed 2017-06-05 17:44:01 -05:00
commit 85ecebc3a4
2 files changed
+15 -11

No files matched your search

+4
View File
@@ -244,11 +244,13 @@ class AuthAPI(object):
migrate = db._migrate migrate = db._migrate
if fake_migrate is None: if fake_migrate is None:
fake_migrate = db._fake_migrate fake_migrate = db._fake_migrate
settings = self.settings settings = self.settings
if username is None: if username is None:
username = settings.use_username username = settings.use_username
else: else:
settings.use_username = username settings.use_username = username
if not self.signature: if not self.signature:
self.define_signature() self.define_signature()
if signature is True: if signature is True:
@@ -259,6 +261,8 @@ class AuthAPI(object):
signature_list = [signature] signature_list = [signature]
else: else:
signature_list = signature signature_list = signature
self._table_signature_list = signature_list
is_not_empty = IS_NOT_EMPTY(error_message=self.messages.is_empty) is_not_empty = IS_NOT_EMPTY(error_message=self.messages.is_empty)
is_crypted = CRYPT(key=settings.hmac_key, is_crypted = CRYPT(key=settings.hmac_key,
min_length=settings.password_min_length) min_length=settings.password_min_length)
+11 -11
View File
@@ -2214,7 +2214,7 @@ class Auth(AuthAPI):
fake_migrate = db._fake_migrate fake_migrate = db._fake_migrate
settings = self.settings settings = self.settings
settings.enable_tokens = enable_tokens settings.enable_tokens = enable_tokens
super(Auth, self).define_tables(username, signature, migrate, fake_migrate) signature_list = super(Auth, self).define_tables(username, signature, migrate, fake_migrate)._table_signature_list
now = current.request.now now = current.request.now
reference_table_user = 'reference %s' % settings.table_user_name reference_table_user = 'reference %s' % settings.table_user_name
@@ -3763,7 +3763,6 @@ class Auth(AuthAPI):
else: else:
self.user.update(table_user._filter_fields(form.vars)) self.user.update(table_user._filter_fields(form.vars))
session.flash = self.messages.profile_updated session.flash = self.messages.profile_updated
self.log_event(log, self.user) self.log_event(log, self.user)
callback(onaccept, form) callback(onaccept, form)
@@ -4220,15 +4219,15 @@ class Auth(AuthAPI):
class Crud(object): # pragma: no cover class Crud(object): # pragma: no cover
default_messages = dict( default_messages = dict(
submit_button = 'Submit', submit_button='Submit',
delete_label = 'Check to delete', delete_label='Check to delete',
record_created = 'Record Created', record_created='Record Created',
record_updated = 'Record Updated', record_updated='Record Updated',
record_deleted = 'Record Deleted', record_deleted='Record Deleted',
update_log = 'Record %(id)s updated', update_log='Record %(id)s updated',
create_log = 'Record %(id)s created', create_log='Record %(id)s created',
read_log = 'Record %(id)s read', read_log='Record %(id)s read',
delete_log = 'Record %(id)s deleted', delete_log='Record %(id)s deleted',
) )
def url(self, f=None, args=None, vars=None): def url(self, f=None, args=None, vars=None):
@@ -5485,6 +5484,7 @@ class Service(object):
else: else:
return f(*a, **b) return f(*a, **b)
def completion(callback): def completion(callback):
""" """
Executes a task on completion of the called action. Executes a task on completion of the called action.