Commit 02a2fbc5 authored by Mikaël Salson's avatar Mikaël Salson

Merge branch 'hotfix-s/error-on-save-analysis' into 'dev'

[Hotfix] Error on save analysis

See merge request !399
parents 5b0ba979 94aa4e72
Pipeline #61824 failed with stages
in 1 minute and 49 seconds
...@@ -456,7 +456,7 @@ def get_analysis(): ...@@ -456,7 +456,7 @@ def get_analysis():
#analysis_data["info_patient"] = db.patient[request.vars["patient"]].info #analysis_data["info_patient"] = db.patient[request.vars["patient"]].info
dumped_json = gluon.contrib.simplejson.dumps(analysis_data, separators=(',',':')) dumped_json = gluon.contrib.simplejson.dumps(analysis_data, separators=(',',':'))
log.info("load analysis", extra={'user_id': auth.user.id, 'record_id': request.vars['sample_id'], 'table_name': 'sample_set'}) log.info("load analysis", extra={'user_id': auth.user.id, 'record_id': request.vars['sample_set_id'], 'table_name': 'sample_set'})
if download: if download:
return response.stream(StringIO.StringIO(dumped_json), attachment = True, filename = request.vars['filename']) return response.stream(StringIO.StringIO(dumped_json), attachment = True, filename = request.vars['filename'])
...@@ -523,7 +523,7 @@ def save_analysis(): ...@@ -523,7 +523,7 @@ def save_analysis():
"message" : "(%s): analysis saved" % (sample_set_id)} "message" : "(%s): analysis saved" % (sample_set_id)}
log.info(res, extra={'user_id': auth.user.id}) log.info(res, extra={'user_id': auth.user.id})
log.info("save analysis", extra={'user_id': auth.user.id, 'record_id': request.vars['samples_id'], 'table_name': 'sample_set'}) log.info("save analysis", extra={'user_id': auth.user.id, 'record_id': sample_set_id, 'table_name': 'sample_set'})
return gluon.contrib.simplejson.dumps(res, separators=(',',':')) return gluon.contrib.simplejson.dumps(res, separators=(',',':'))
else : else :
res = {"success" : "false", res = {"success" : "false",
......
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