dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed potential problem with unwanted translation of log messages

Browse Source
This commit is contained in:
mdipierro
2013-07-08 08:47:24 -05:00
parent b4fe6720ae
commit 89e158cd1d
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.6.0-development+timestamp.2013.07.08.08.38.58 Version 2.6.0-development+timestamp.2013.07.08.08.46.42
gluon/storage.py
+1 -1
View File
@@ -175,7 +175,7 @@ class Messages(Settings):
def __getattr__(self, key): def __getattr__(self, key):
value = self[key] value = self[key]
if isinstance(value, str): if isinstance(value, str):
return self.T(value) return str(self.T(value))
return value return value
class FastStorage(dict): class FastStorage(dict):
gluon/tools.py
+20 -20
View File
@@ -2047,7 +2047,7 @@ class Auth(object):
if onaccept is DEFAULT: if onaccept is DEFAULT:
onaccept = self.settings.login_onaccept onaccept = self.settings.login_onaccept
if log is DEFAULT: if log is DEFAULT:
log = self.messages.login_log log = self.messages['login_log']
onfail = self.settings.login_onfail onfail = self.settings.login_onfail
@@ -2161,7 +2161,7 @@ class Auth(object):
form.vars, self.settings.update_fields) form.vars, self.settings.update_fields)
break break
if not user: if not user:
self.log_event(self.messages.login_failed_log, self.log_event(self.messages['login_failed_log'],
request.post_vars) request.post_vars)
# invalid login # invalid login
session.flash = self.messages.invalid_login session.flash = self.messages.invalid_login
@@ -2236,7 +2236,7 @@ class Auth(object):
if onlogout: if onlogout:
onlogout(self.user) onlogout(self.user)
if log is DEFAULT: if log is DEFAULT:
log = self.messages.logout_log log = self.messages['logout_log']
if self.user: if self.user:
self.log_event(log, self.user) self.log_event(log, self.user)
if self.settings.login_form != self: if self.settings.login_form != self:
@@ -2281,7 +2281,7 @@ class Auth(object):
if onaccept is DEFAULT: if onaccept is DEFAULT:
onaccept = self.settings.register_onaccept onaccept = self.settings.register_onaccept
if log is DEFAULT: if log is DEFAULT:
log = self.messages.register_log log = self.messages['register_log']
table_user = self.table_user() table_user = self.table_user()
if self.settings.login_userfield: if self.settings.login_userfield:
@@ -2433,7 +2433,7 @@ class Auth(object):
if current.session.auth and current.session.auth.user: if current.session.auth and current.session.auth.user:
current.session.auth.user.registration_key = user.registration_key current.session.auth.user.registration_key = user.registration_key
if log is DEFAULT: if log is DEFAULT:
log = self.messages.verify_email_log log = self.messages['verify_email_log']
if next is DEFAULT: if next is DEFAULT:
next = self.settings.verify_email_next next = self.settings.verify_email_next
if onaccept is DEFAULT: if onaccept is DEFAULT:
@@ -2476,7 +2476,7 @@ class Auth(object):
if onaccept is DEFAULT: if onaccept is DEFAULT:
onaccept = self.settings.retrieve_username_onaccept onaccept = self.settings.retrieve_username_onaccept
if log is DEFAULT: if log is DEFAULT:
log = self.messages.retrieve_username_log log = self.messages['retrieve_username_log']
old_requires = table_user.email.requires old_requires = table_user.email.requires
table_user.email.requires = [IS_IN_DB(self.db, table_user.email, table_user.email.requires = [IS_IN_DB(self.db, table_user.email,
error_message=self.messages.invalid_email)] error_message=self.messages.invalid_email)]
@@ -2558,7 +2558,7 @@ class Auth(object):
if onaccept is DEFAULT: if onaccept is DEFAULT:
onaccept = self.settings.retrieve_password_onaccept onaccept = self.settings.retrieve_password_onaccept
if log is DEFAULT: if log is DEFAULT:
log = self.messages.retrieve_password_log log = self.messages['retrieve_password_log']
old_requires = table_user.email.requires old_requires = table_user.email.requires
table_user.email.requires = [IS_IN_DB(self.db, table_user.email, table_user.email.requires = [IS_IN_DB(self.db, table_user.email,
error_message=self.messages.invalid_email)] error_message=self.messages.invalid_email)]
@@ -2698,7 +2698,7 @@ class Auth(object):
if onaccept is DEFAULT: if onaccept is DEFAULT:
onaccept = self.settings.reset_password_onaccept onaccept = self.settings.reset_password_onaccept
if log is DEFAULT: if log is DEFAULT:
log = self.messages.reset_password_log log = self.messages['reset_password_log']
table_user.email.requires = [ table_user.email.requires = [
IS_EMAIL(error_message=self.messages.invalid_email), IS_EMAIL(error_message=self.messages.invalid_email),
IS_IN_DB(self.db, table_user.email, IS_IN_DB(self.db, table_user.email,
@@ -2798,7 +2798,7 @@ class Auth(object):
if onaccept is DEFAULT: if onaccept is DEFAULT:
onaccept = self.settings.change_password_onaccept onaccept = self.settings.change_password_onaccept
if log is DEFAULT: if log is DEFAULT:
log = self.messages.change_password_log log = self.messages['change_password_log']
passfield = self.settings.password_field passfield = self.settings.password_field
form = SQLFORM.factory( form = SQLFORM.factory(
Field('old_password', 'password', Field('old_password', 'password',
@@ -2867,7 +2867,7 @@ class Auth(object):
if onaccept is DEFAULT: if onaccept is DEFAULT:
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,
@@ -2933,7 +2933,7 @@ class Auth(object):
self.user = auth.user self.user = auth.user
self.update_groups() self.update_groups()
onaccept = self.settings.login_onaccept onaccept = self.settings.login_onaccept
log = self.messages.impersonate_log log = self.messages['impersonate_log']
self.log_event(log, dict(id=current_id, other_id=auth.user.id)) self.log_event(log, dict(id=current_id, other_id=auth.user.id))
if onaccept: if onaccept:
form = Storage(dict(vars=self.user)) form = Storage(dict(vars=self.user))
@@ -3089,7 +3089,7 @@ class Auth(object):
group_id = self.table_group().insert( group_id = self.table_group().insert(
role=role, description=description) role=role, description=description)
self.log_event(self.messages.add_group_log, self.log_event(self.messages['add_group_log'],
dict(group_id=group_id, role=role)) dict(group_id=group_id, role=role))
return group_id return group_id
@@ -3146,7 +3146,7 @@ class Auth(object):
r = True r = True
else: else:
r = False r = False
self.log_event(self.messages.has_membership_log, self.log_event(self.messages['has_membership_log'],
dict(user_id=user_id, group_id=group_id, check=r)) dict(user_id=user_id, group_id=group_id, check=r))
return r return r
@@ -3170,7 +3170,7 @@ class Auth(object):
else: else:
id = membership.insert(group_id=group_id, user_id=user_id) id = membership.insert(group_id=group_id, user_id=user_id)
self.update_groups() self.update_groups()
self.log_event(self.messages.add_membership_log, self.log_event(self.messages['add_membership_log'],
dict(user_id=user_id, group_id=group_id)) dict(user_id=user_id, group_id=group_id))
return id return id
@@ -3184,7 +3184,7 @@ class Auth(object):
if not user_id and self.user: if not user_id and self.user:
user_id = self.user.id user_id = self.user.id
membership = self.table_membership() membership = self.table_membership()
self.log_event(self.messages.del_membership_log, self.log_event(self.messages['del_membership_log'],
dict(user_id=user_id, group_id=group_id)) dict(user_id=user_id, group_id=group_id))
ret = self.db(membership.user_id ret = self.db(membership.user_id
== user_id)(membership.group_id == user_id)(membership.group_id
@@ -3240,7 +3240,7 @@ class Auth(object):
else: else:
r = False r = False
if user_id: if user_id:
self.log_event(self.messages.has_permission_log, self.log_event(self.messages['has_permission_log'],
dict(user_id=user_id, name=name, dict(user_id=user_id, name=name,
table_name=table_name, record_id=record_id)) table_name=table_name, record_id=record_id))
return r return r
@@ -3267,7 +3267,7 @@ class Auth(object):
id = permission.insert(group_id=group_id, name=name, id = permission.insert(group_id=group_id, name=name,
table_name=str(table_name), table_name=str(table_name),
record_id=long(record_id)) record_id=long(record_id))
self.log_event(self.messages.add_permission_log, self.log_event(self.messages['add_permission_log'],
dict(permission_id=id, group_id=group_id, dict(permission_id=id, group_id=group_id,
name=name, table_name=table_name, name=name, table_name=table_name,
record_id=record_id)) record_id=record_id))
@@ -3285,7 +3285,7 @@ class Auth(object):
""" """
permission = self.table_permission() permission = self.table_permission()
self.log_event(self.messages.del_permission_log, self.log_event(self.messages['del_permission_log'],
dict(group_id=group_id, name=name, dict(group_id=group_id, name=name,
table_name=table_name, record_id=record_id)) table_name=table_name, record_id=record_id))
return self.db(permission.group_id == group_id)(permission.name return self.db(permission.group_id == group_id)(permission.name
@@ -3636,7 +3636,7 @@ class Crud(object):
if ondelete is DEFAULT: if ondelete is DEFAULT:
ondelete = self.settings.update_ondelete ondelete = self.settings.update_ondelete
if log is DEFAULT: if log is DEFAULT:
log = self.messages.update_log log = self.messages['update_log']
if deletable is DEFAULT: if deletable is DEFAULT:
deletable = self.settings.update_deletable deletable = self.settings.update_deletable
if message is DEFAULT: if message is DEFAULT:
@@ -3727,7 +3727,7 @@ class Crud(object):
if onaccept is DEFAULT: if onaccept is DEFAULT:
onaccept = self.settings.create_onaccept onaccept = self.settings.create_onaccept
if log is DEFAULT: if log is DEFAULT:
log = self.messages.create_log log = self.messages['create_log']
if message is DEFAULT: if message is DEFAULT:
message = self.messages.record_created message = self.messages.record_created
return self.update( return self.update(