lims, lims_report_html: revert "results report: force PDF format"
This commit is contained in:
parent
5b667c1118
commit
349c1bc504
|
@ -3637,8 +3637,8 @@ class ResultReport(Report):
|
||||||
result = result_eng
|
result = result_eng
|
||||||
if ('english_report' in current_data and
|
if ('english_report' in current_data and
|
||||||
current_data['english_report']):
|
current_data['english_report']):
|
||||||
results_report.report_format_eng = 'pdf'
|
results_report.report_format_eng, \
|
||||||
results_report.report_cache_eng = result_eng[1]
|
results_report.report_cache_eng = result_eng[:2]
|
||||||
save = True
|
save = True
|
||||||
else:
|
else:
|
||||||
if results_report.report_cache:
|
if results_report.report_cache:
|
||||||
|
@ -3648,8 +3648,8 @@ class ResultReport(Report):
|
||||||
result = result_orig
|
result = result_orig
|
||||||
if ('english_report' in current_data and
|
if ('english_report' in current_data and
|
||||||
not current_data['english_report']):
|
not current_data['english_report']):
|
||||||
results_report.report_format = 'pdf'
|
results_report.report_format, \
|
||||||
results_report.report_cache = result_orig[1]
|
results_report.report_cache = result_orig[:2]
|
||||||
save = True
|
save = True
|
||||||
if save:
|
if save:
|
||||||
results_report.save()
|
results_report.save()
|
||||||
|
|
|
@ -419,8 +419,8 @@ class ResultReport(metaclass=PoolMeta):
|
||||||
result = result_eng
|
result = result_eng
|
||||||
if ('english_report' in current_data and
|
if ('english_report' in current_data and
|
||||||
current_data['english_report']):
|
current_data['english_report']):
|
||||||
results_report.report_format_eng = 'pdf'
|
results_report.report_format_eng, \
|
||||||
results_report.report_cache_eng = result_eng[1]
|
results_report.report_cache_eng = result_eng[:2]
|
||||||
save = True
|
save = True
|
||||||
else:
|
else:
|
||||||
if results_report.report_cache:
|
if results_report.report_cache:
|
||||||
|
@ -430,8 +430,8 @@ class ResultReport(metaclass=PoolMeta):
|
||||||
result = result_orig
|
result = result_orig
|
||||||
if ('english_report' in current_data and
|
if ('english_report' in current_data and
|
||||||
not current_data['english_report']):
|
not current_data['english_report']):
|
||||||
results_report.report_format = 'pdf'
|
results_report.report_format, \
|
||||||
results_report.report_cache = result_orig[1]
|
results_report.report_cache = result_orig[:2]
|
||||||
save = True
|
save = True
|
||||||
if save:
|
if save:
|
||||||
results_report.save()
|
results_report.save()
|
||||||
|
|
Loading…
Reference in New Issue