Commit f9c230b7 authored by Bartek Górny's avatar Bartek Górny

return original format if no format specified

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@12924 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 5539d47f
master ERP5Type_no_immediate_reindexation allow_login_change allow_login_change_differentiate_id_and_login allow_login_change_wip arnau arnau-kns arnau-kns-without-property-mapping arnau-merge arnau-poc auto_extend_select_list autoflake backup_erp5_workflow bk_erp5ish_actions_tool bk_sqlcatalog boc-interaction-drop cache catalog_fulltext catalog_fulltext_old cedric cedriclen cedriclen-eos cert certificate_authority cherry-pick-4a8e045d ckeditor_update cleanJSByJSLint clean_up_upgrader cmfactivity compact_title_no_reference credential_update_action datetimefield deferred_listbox douglas_forum dream_distributor drop-legacy-simulation echarts_with_event echarts_wrapper eos-dev erp5-component erp5-data-notebook erp5-doc erp5-forum erp5-preference erp5-release erp5-slapos-upgrade erp5-util-testing erp5-vifib erp5-vifib-cleanup erp5_calendar erp5_free_subscription erp5_notebook erp5_notebook_remove erp5_officejs_fixing erp5_tutorial_backup erp5_workflow erp5jsaccesspage fix/accounting_period_constraint_vs_acquired_node fix/change_state_priority fix/login_validate_check_consistency fix_system_processes_ownership for_private_testrunner_1 for_testrunner_1 for_testrunner_2 formbox gabriel gabriel-fix-rounding-in-accounting-generation gabriel-fix-rounding-in-accounting-generation2 gadget-json-value http_cache_fix import_zip_package improve_default_caching_policy_manager interaction-drop isDeletable item_tracking_graph_editor ivan jerome-bt-reference-doc jerome-test jerome_events jerome_graph_editor_renderjs jerome_new_style_solve_divergence jerome_promise_in_tests jerome_user_preference_time_zone jio jm/form-action-guard joblib-activity kns kns-kr lazy_simulation_causality lignan lingnan listbox-generator mame mame-bt5-cleanup mame-erp5_project-cleanup mame-naming-convention mame-naming-convention-list_method mame-test-stock-indexation mame-work mame2 master-erp5-test-result-scalability master-erp5-test-result-scalability-rebase master-test-fix-additionalbt5path master_calendar_wip_patches master_calendar_wip_patches_extend_security master_no_guard_on_workflow_transition master_no_guard_on_workflow_transition_plus_calendar_wip_patchs master_test merge_xhtml_jquery mmariani-inventory mrp new-render-presentation new_notebook_sub nexedi-erp5-jp no_longer_simulated_state notebook_submodule notebook_submodule_backup officejs officejs_clean officejs_mixing_echarts pere portal_callables portal_solver_process_security_configuration presentation pyodide pyodide_backup pyodide_bk pyodide_external pyodide_submodule pyodide_submodule_normal pyodide_webworker rapid_wechat rebased_mrp reindex reindex_calendar_after_change_calendar_exception resursive_clone romain-fulltext scalability-master2 scalability-master2-rebase scalability-rebase shop-box simulation slapos_master slapos_tutorial sms_more_than_140_characters strict_catalog submodule support_request support_request_1 support_request_2 support_request_3 support_request_4 support_request_update syncml test_page testnode_software_link timezones tristan tristan-merge tristan-performance ttr ttrm upgradeSite view-aggregated-amounts vifib-fixup vivekpab_erp5webrenderjs_layoutconfig vivekpab_jabberclient vivekpab_renderjs_interfaces wechat_test wenjie wenjie_branch xiaowu_newui yryr yryr-components-cp yryr-inventory-cache yryr-test yryr-with-components yusei erp5.util-0.4.46 erp5.util-0.4.44 erp5.util-0.4.43 erp5.util-0.4.41 erp5.util-0.4.40 erp5.util-0.4.37 erp5.util-0.4.1 erp5.util-0.4 erp5.util-0.3 erp5.util-0.2 erp5.util-0.1
No related merge requests found
...@@ -68,12 +68,15 @@ class PDFDocument(File, ConversionCacheMixin): ...@@ -68,12 +68,15 @@ class PDFDocument(File, ConversionCacheMixin):
) )
def index_html(self, REQUEST, RESPONSE, format, force=0): def index_html(self, REQUEST, RESPONSE, format=None, force=0):
""" """
Returns data in the appropriate format (graphical) Returns data in the appropriate format (graphical)
it is always a zip because multi-page pdfs are converted into a zip it is always a zip because multi-page pdfs are converted into a zip
file of many images file of many images
""" """
if format is None:
RESPONSE.setHeader('Content-Type', 'application/pdf')
return self._unpackData(self.data)
if format == 'html': if format == 'html':
RESPONSE.setHeader('Content-Type', 'text/html;charset=UTF-8') RESPONSE.setHeader('Content-Type', 'text/html;charset=UTF-8')
return self.getHtmlRepresentation(force) return self.getHtmlRepresentation(force)
......
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