Commit 514f0fe7 authored by Ryan Herbert's avatar Ryan Herbert

sample_set.py db.py fix some decoding hell

issues with accents in set names...
parent 91fc4362
......@@ -500,7 +500,7 @@ def submit():
error = True
p['message'] = []
mes = "%s (%s) %s %sed" % (set_type, id_sample_set, name, action)
mes = u"%s (%s) %s %sed" % (set_type, id_sample_set, name, action)
p['message'].append(mes)
log.info(mes, extra={'user_id': auth.user.id, 'record_id': p['id'], 'table_name': 'patient'})
if register:
......
......@@ -313,7 +313,7 @@ class MsgUserAdapter(logging.LoggerAdapter):
usern = usern.replace(' ','-')
if auth.is_impersonating():
usern = 'team!' + usern
new_msg = u'%30s %12s %s' % (ip, (u'<%s>' % usern.decode('utf8')), msg.decode('utf8'))
new_msg = u'%30s %12s %s' % (ip, (u'<%s>' % usern.decode('utf8')), msg)
return new_msg, kwargs
def admin(self, msg):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment