collective.documentgenerator 3.46__tar.gz → 3.47.1__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/CHANGES.rst +18 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/PKG-INFO +19 -1
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/setup.py +3 -1
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/browser/converter.py +4 -3
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/browser/generation_view.py +4 -3
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/config.py +5 -1
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/events/styles_events.py +1 -4
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/tests/test_utils.py +39 -13
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/utils.py +68 -38
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective.documentgenerator.egg-info/PKG-INFO +19 -1
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/.coveragerc +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/.isort.cfg +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/.tx/config +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/MANIFEST.in +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/Makefile +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/README.rst +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/buildout.cfg +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/docs/LICENSE.GPL +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/docs/LICENSE.rst +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/docs/developer.rst +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/docs/images/AddPODTTemplateMenu.png +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/docs/images/addPloneSite.png +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/docs/images/demoInstal.png +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/docs/images/documentgenerator-searchreplacepanel.png +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/docs/images/viewlet.png +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/docs/search_replace.rst +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/docs/technical.rst +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/docs/user.rst +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/setup.cfg +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/__init__.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/AT_renderer.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/DX_renderer.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/__init__.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/adapters.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/browser/__init__.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/browser/actionspanel.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/browser/check_pod_templates.pt +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/browser/children_pod_template.pt +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/browser/configure.zcml +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/browser/controlpanel.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/browser/overrides.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/browser/resources/css/documentgenerator.css +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/browser/static/.gitkeep +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/browser/static/configurable.svg +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/browser/static/csv.svg +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/browser/static/doc.svg +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/browser/static/docx.svg +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/browser/static/download_icon.svg +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/browser/static/libreoffice-blanck.svg +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/browser/static/mailinglooptemplate.svg +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/browser/static/missing_use.svg +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/browser/static/nok.svg +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/browser/static/nok_use.svg +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/browser/static/nok_used.svg +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/browser/static/odp.svg +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/browser/static/ods.svg +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/browser/static/odt.svg +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/browser/static/ok.svg +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/browser/static/ok_use.svg +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/browser/static/ok_used.svg +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/browser/static/pdf.svg +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/browser/static/podtemplate.svg +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/browser/static/rtf.svg +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/browser/static/style.svg +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/browser/static/subtemplate.svg +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/browser/static/xls.svg +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/browser/static/xlsx.svg +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/browser/table.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/browser/templates_listing.pt +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/browser/views.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/configure.zcml +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/content/__init__.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/content/condition.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/content/conditions.zcml +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/content/configure.zcml +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/content/document_factory.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/content/file_representation.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/content/file_representation.zcml +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/content/merge_templates.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/content/merge_templates.zcml +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/content/pod_template.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/content/style_template.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/content/vocabulary.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/content/vocabulary.zcml +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/demo/__init__.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/demo/archetypes.zcml +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/demo/configure.zcml +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/demo/helper.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/events/__init__.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/events/configure.zcml +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/events/pod_templates_events.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/helper/__init__.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/helper/archetypes-adapter.zcml +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/helper/archetypes-page.zcml +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/helper/archetypes.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/helper/base.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/helper/configure.zcml +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/helper/dexterity.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/interfaces.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/locales/collective.documentgenerator.pot +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/locales/es/LC_MESSAGES/collective.documentgenerator.po +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/locales/es/LC_MESSAGES/plone.po +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/locales/fr/LC_MESSAGES/collective.documentgenerator.po +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/locales/fr/LC_MESSAGES/plone.po +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/locales/manual.pot +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/locales/plone-manual.pot +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/locales/plone.pot +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/locales/update.sh +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/migrations/__init__.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/migrations/migrate_to_11.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/migrations/migrate_to_12.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/migrations/migrate_to_13.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/migrations/migrate_to_3.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/migrations/migrate_to_5.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/migrations/migrate_to_6.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/migrations/migrate_to_7.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/migrations/migrate_to_8.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/migrations/migrate_to_9.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/profiles/base/browserlayer.xml +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/profiles/base/controlpanel.xml +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/profiles/base/metadata.xml +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/profiles/base/types/ConfigurablePODTemplate.xml +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/profiles/base/types/MailingLoopTemplate.xml +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/profiles/base/types/PODTemplate.xml +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/profiles/base/types/StyleTemplate.xml +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/profiles/base/types/SubTemplate.xml +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/profiles/base/types.xml +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/profiles/base/viewlets.xml +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/profiles/demo/browserlayer.xml +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/profiles/demo/collectivedocumentgenerator_demo_marker.txt +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/profiles/demo/import_steps.xml +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/profiles/demo/metadata.xml +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/profiles/demo/registry.xml +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/profiles/demo/templates/mailing.odt +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/profiles/demo/templates/modele_general.ods +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/profiles/demo/templates/modele_general.odt +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/profiles/demo/templates/mod/303/250le_collection.odt" +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/profiles/demo/templates/possibly_mailed_model.odt +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/profiles/demo/templates/styles.odt +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/profiles/demo/templates/styles_2.odt +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/profiles/demo/templates/sub_template.odt +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/profiles/demo/viewlets.xml +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/profiles/plone4/collectivedocumentgenerator_marker.txt +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/profiles/plone4/cssregistry.xml +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/profiles/plone4/metadata.xml +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/profiles/plone4/registry.xml +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/profiles/plone5/metadata.xml +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/profiles/plone5/registry.xml +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/profiles/testing/metadata.xml +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/profiles/testing/propertiestool.xml +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/profiles/testing/types/member.xml +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/profiles/testing/types.xml +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/profiles.zcml +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/renderer.zcml +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/search_replace/__init__.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/search_replace/configure.zcml +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/search_replace/pod_template.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/search_replace/search_result_form.pt +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/search_replace/searchreplace_panel.pt +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/search_replace/searchreplace_panel.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/setuphandlers.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/testing.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/testing.zcml +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/tests/__init__.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/tests/failing_template.odt +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/tests/robot/.gitkeep +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/tests/template_to_clean.odt +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/tests/template_without_style_page.odt +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/tests/test_AT_helper_view.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/tests/test_DX_helper_view.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/tests/test_base_helper_view.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/tests/test_check_podtemplates_view.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/tests/test_config.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/tests/test_configurable_pod_template.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/tests/test_demo_profile.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/tests/test_events.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/tests/test_file.odt +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/tests/test_generation_view.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/tests/test_mailing.odt +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/tests/test_mailing_loop_template.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/tests/test_pod_template.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/tests/test_robot.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/tests/test_search_replace.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/tests/test_setup.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/tests/test_style_template.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/tests/test_sub_template.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/tests/test_templates_listing_view.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/tests/test_vocabulary.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/viewlets/__init__.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/viewlets/batchactions.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/viewlets/configure.zcml +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/viewlets/generationlinks.pt +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/documentgenerator/viewlets/generationlinks.py +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective.documentgenerator.egg-info/SOURCES.txt +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective.documentgenerator.egg-info/dependency_links.txt +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective.documentgenerator.egg-info/entry_points.txt +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective.documentgenerator.egg-info/namespace_packages.txt +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective.documentgenerator.egg-info/not-zip-safe +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective.documentgenerator.egg-info/requires.txt +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective.documentgenerator.egg-info/top_level.txt +0 -0
- {collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/test-ci.cfg +0 -0
|
@@ -1,6 +1,24 @@
|
|
|
1
1
|
Changelog
|
|
2
2
|
=========
|
|
3
3
|
|
|
4
|
+
3.47.1 (2026-03-26)
|
|
5
|
+
-------------------
|
|
6
|
+
|
|
7
|
+
- Moved CONVSCRIPT to config.py
|
|
8
|
+
[chris-adam]
|
|
9
|
+
|
|
10
|
+
3.47 (2026-03-03)
|
|
11
|
+
-----------------
|
|
12
|
+
|
|
13
|
+
- Used renderer.run in `utils.convert_odt` and added gen_context as param.
|
|
14
|
+
[sgeulette]
|
|
15
|
+
- Added "from_doc_uid" in generated doc annotation after MailingLoopPersistentDocumentGenerationView call.
|
|
16
|
+
[sgeulette]
|
|
17
|
+
- Added `utils.get_original_template` to get the original pod template, even after a mailing loop generation,
|
|
18
|
+
[sgeulette]
|
|
19
|
+
- Simplified `utils.convert_odt` and `utils.convert_file` parameters and returned value.
|
|
20
|
+
[sgeulette]
|
|
21
|
+
|
|
4
22
|
3.46 (2026-01-15)
|
|
5
23
|
-----------------
|
|
6
24
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: collective.documentgenerator
|
|
3
|
-
Version: 3.
|
|
3
|
+
Version: 3.47.1
|
|
4
4
|
Summary: Desktop document generation (.odt, .pdf, .doc, ...) based on appy framework (https://appyframe.work/tool/public) and OpenOffice/LibreOffice
|
|
5
5
|
Home-page: https://pypi.org/project/collective.documentgenerator
|
|
6
6
|
Author: Simon Delcourt
|
|
@@ -216,6 +216,24 @@ The project is licensed under the GPLv2.
|
|
|
216
216
|
Changelog
|
|
217
217
|
=========
|
|
218
218
|
|
|
219
|
+
3.47.1 (2026-03-26)
|
|
220
|
+
-------------------
|
|
221
|
+
|
|
222
|
+
- Moved CONVSCRIPT to config.py
|
|
223
|
+
[chris-adam]
|
|
224
|
+
|
|
225
|
+
3.47 (2026-03-03)
|
|
226
|
+
-----------------
|
|
227
|
+
|
|
228
|
+
- Used renderer.run in `utils.convert_odt` and added gen_context as param.
|
|
229
|
+
[sgeulette]
|
|
230
|
+
- Added "from_doc_uid" in generated doc annotation after MailingLoopPersistentDocumentGenerationView call.
|
|
231
|
+
[sgeulette]
|
|
232
|
+
- Added `utils.get_original_template` to get the original pod template, even after a mailing loop generation,
|
|
233
|
+
[sgeulette]
|
|
234
|
+
- Simplified `utils.convert_odt` and `utils.convert_file` parameters and returned value.
|
|
235
|
+
[sgeulette]
|
|
236
|
+
|
|
219
237
|
3.46 (2026-01-15)
|
|
220
238
|
-----------------
|
|
221
239
|
|
|
@@ -11,7 +11,7 @@ long_description = (
|
|
|
11
11
|
|
|
12
12
|
setup(
|
|
13
13
|
name='collective.documentgenerator',
|
|
14
|
-
version='3.
|
|
14
|
+
version='3.47.1',
|
|
15
15
|
description="Desktop document generation (.odt, .pdf, .doc, ...) based on appy framework (https://appyframe.work/tool/public) and OpenOffice/LibreOffice",
|
|
16
16
|
long_description=long_description,
|
|
17
17
|
# Get more from https://pypi.org/pypi?%3Aaction=list_classifiers
|
|
@@ -68,5 +68,7 @@ setup(
|
|
|
68
68
|
target = plone
|
|
69
69
|
[console_scripts]
|
|
70
70
|
odfsplit = appy.bin.odfsplit:main
|
|
71
|
+
# converter script to be used once the project runs python 3
|
|
72
|
+
# converter = appy.pod.converter:main
|
|
71
73
|
""",
|
|
72
74
|
)
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
from collective.documentgenerator.utils import convert_and_save_file
|
|
3
3
|
from collective.documentgenerator.utils import convert_file
|
|
4
4
|
from plone.namedfile.file import NamedBlobFile
|
|
5
|
+
from Products.CMFPlone.utils import safe_unicode
|
|
5
6
|
from Products.Five import BrowserView
|
|
6
7
|
|
|
7
8
|
import mimetypes
|
|
@@ -19,15 +20,15 @@ class DocumentConvertView(BrowserView):
|
|
|
19
20
|
|
|
20
21
|
def __call__(self):
|
|
21
22
|
output_name, fmt = self.get_params()
|
|
22
|
-
|
|
23
|
+
converted_file = convert_file(self.context.file, fmt=fmt)
|
|
23
24
|
|
|
24
25
|
# Set headers
|
|
25
26
|
response = self.request.RESPONSE
|
|
26
|
-
mimetype = mimetypes.guess_type(
|
|
27
|
+
mimetype = mimetypes.guess_type(output_name)[0]
|
|
27
28
|
response.setHeader('Content-type', mimetype)
|
|
28
29
|
response.setHeader(
|
|
29
30
|
'Content-disposition',
|
|
30
|
-
u'inline;filename="{}"'.format(
|
|
31
|
+
u'inline;filename="{}"'.format(safe_unicode(output_name))
|
|
31
32
|
)
|
|
32
33
|
|
|
33
34
|
return converted_file
|
|
@@ -401,7 +401,7 @@ class PersistentDocumentGenerationView(DocumentGenerationView):
|
|
|
401
401
|
def add_mailing_infos(self, doc, gen_context):
|
|
402
402
|
""" store mailing informations on generated doc """
|
|
403
403
|
annot = IAnnotations(doc)
|
|
404
|
-
if 'mailed_data' in gen_context or 'mailing_list' in gen_context:
|
|
404
|
+
if 'mailed_data' in gen_context or 'mailing_list' in gen_context: # direct or mailed document
|
|
405
405
|
annot['documentgenerator'] = {'need_mailing': False, 'template_uid': self.pod_template.UID()}
|
|
406
406
|
else:
|
|
407
407
|
annot['documentgenerator'] = {'need_mailing': True, 'template_uid': self.pod_template.UID(),
|
|
@@ -493,9 +493,10 @@ class MailingLoopPersistentDocumentGenerationView(PersistentDocumentGenerationVi
|
|
|
493
493
|
self.redirects(persisted_doc)
|
|
494
494
|
|
|
495
495
|
def add_mailing_infos(self, doc, gen_context):
|
|
496
|
-
"""
|
|
496
|
+
"""Store mailing information on generated doc"""
|
|
497
497
|
annot = IAnnotations(doc)
|
|
498
|
-
annot['documentgenerator'] = {"need_mailing": False, "template_uid": self.pod_template.UID(), "mailed": True
|
|
498
|
+
annot['documentgenerator'] = {"need_mailing": False, "template_uid": self.pod_template.UID(), "mailed": True,
|
|
499
|
+
"from_doc_uid": self.document.UID()}
|
|
499
500
|
|
|
500
501
|
def _get_base_args(self, template_uid, output_format):
|
|
501
502
|
annot = IAnnotations(self.document).get('documentgenerator', '')
|
|
@@ -4,6 +4,7 @@ from imio.helpers import HAS_PLONE_5_2
|
|
|
4
4
|
from plone import api
|
|
5
5
|
from Products.CMFPlone.utils import safe_unicode
|
|
6
6
|
|
|
7
|
+
import appy.pod
|
|
7
8
|
import os
|
|
8
9
|
import re
|
|
9
10
|
|
|
@@ -35,10 +36,13 @@ DEFAULT_CSV_FIELD_DELIMITERS = {
|
|
|
35
36
|
u'Comma': u',', u'Semicolon': u';', u'Colon': u':', u'Space': u' ', u'Tabulation': u'\t'}
|
|
36
37
|
DEFAULT_CSV_STRING_DELIMITERS = {u"Double Quote": u'"', u"Single Quote": u"'"}
|
|
37
38
|
|
|
39
|
+
CONVSCRIPT = '{}/converter.py'.format(os.path.dirname(appy.pod.__file__))
|
|
40
|
+
|
|
38
41
|
|
|
39
42
|
if HAS_PLONE_5_2:
|
|
40
|
-
import sys
|
|
41
43
|
from zope.deprecation import deprecation
|
|
44
|
+
|
|
45
|
+
import sys
|
|
42
46
|
sys.modules['collective.documentgenerator.demo.helper.ATDemoHelperView'] = \
|
|
43
47
|
deprecation.deprecated(deprecation, 'Archetypes was removed from Plone 5.2.')
|
|
44
48
|
|
|
@@ -12,15 +12,12 @@ from Products.CMFPlone.utils import safe_unicode
|
|
|
12
12
|
from zExceptions import Redirect
|
|
13
13
|
from zope.i18n import translate
|
|
14
14
|
|
|
15
|
-
import appy.pod
|
|
16
15
|
import logging
|
|
17
16
|
import os
|
|
18
17
|
|
|
19
18
|
|
|
20
19
|
logger = logging.getLogger('collective.documentgenerator: styles update')
|
|
21
20
|
|
|
22
|
-
CONVSCRIPT = '{}/converter.py'.format(os.path.dirname(appy.pod.__file__))
|
|
23
|
-
|
|
24
21
|
|
|
25
22
|
def update_styles_of_all_PODtemplate(style_template, event):
|
|
26
23
|
"""
|
|
@@ -83,7 +80,7 @@ def _update_template_styles(pod_template, style_template_filename):
|
|
|
83
80
|
cmd = '{path} {script} {tmp_file} {extension} -e ' \
|
|
84
81
|
'{libreoffice_host} -p {port} ' \
|
|
85
82
|
'-t {style_template} -v -a {stream}'.format(path=config.get_uno_path(),
|
|
86
|
-
script=CONVSCRIPT,
|
|
83
|
+
script=config.CONVSCRIPT,
|
|
87
84
|
tmp_file=temp_file.name,
|
|
88
85
|
extension='odt',
|
|
89
86
|
libreoffice_host=config.get_oo_server(),
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
from collective.documentgenerator.testing import PODTemplateIntegrationTest
|
|
3
3
|
from collective.documentgenerator.utils import compute_md5
|
|
4
4
|
from collective.documentgenerator.utils import convert_file
|
|
5
|
+
from collective.documentgenerator.utils import get_original_template
|
|
5
6
|
from collective.documentgenerator.utils import odfsplit
|
|
6
7
|
from collective.documentgenerator.utils import temporary_file_name
|
|
7
8
|
from collective.documentgenerator.utils import update_dict_with_validation
|
|
@@ -9,8 +10,10 @@ from collective.documentgenerator.utils import update_oo_config
|
|
|
9
10
|
from collective.documentgenerator.utils import update_templates
|
|
10
11
|
from os import getenv
|
|
11
12
|
from os import rmdir
|
|
13
|
+
from plone import api
|
|
12
14
|
from plone.api.portal import get_registry_record
|
|
13
15
|
from plone.namedfile import NamedBlobFile
|
|
16
|
+
from zope.annotation import IAnnotations
|
|
14
17
|
from zope.interface import Interface
|
|
15
18
|
from zope.interface import Invalid
|
|
16
19
|
from zope.lifecycleevent import Attributes
|
|
@@ -178,35 +181,29 @@ class TestUtils(PODTemplateIntegrationTest):
|
|
|
178
181
|
|
|
179
182
|
for renderer in (False, True):
|
|
180
183
|
# convert to pdf
|
|
181
|
-
|
|
182
|
-
self.assertEqual(output_name, u"test_file.pdf")
|
|
184
|
+
content = convert_file(odt_blob_file, fmt="pdf", renderer=renderer)
|
|
183
185
|
self.assertTrue(content.startswith("%PDF-"))
|
|
184
186
|
|
|
185
187
|
# convert to odt
|
|
186
|
-
|
|
187
|
-
self.assertEqual(output_name, u"test_file.odt")
|
|
188
|
+
content = convert_file(odt_blob_file, fmt="odt", renderer=renderer)
|
|
188
189
|
self.assertTrue(content.startswith("PK"))
|
|
189
190
|
self.assertIn("mimetype", content) # ODT files contain 'mimetype' in the zip
|
|
190
191
|
|
|
191
192
|
# convert to docx
|
|
192
|
-
|
|
193
|
-
self.assertEqual(output_name, u"test_file.docx")
|
|
193
|
+
content = convert_file(odt_blob_file, fmt="docx", renderer=renderer)
|
|
194
194
|
self.assertTrue(content.startswith("PK"))
|
|
195
195
|
self.assertIn("[Content_Types].xml", content) # DOCX files contain this file
|
|
196
196
|
|
|
197
197
|
# convert to rtf
|
|
198
|
-
|
|
199
|
-
self.assertEqual(output_name, u"test_file.rtf")
|
|
198
|
+
content = convert_file(odt_blob_file, fmt="rtf", renderer=renderer)
|
|
200
199
|
self.assertTrue(content.startswith("{\\rtf1"))
|
|
201
200
|
|
|
202
201
|
# convert to txt
|
|
203
|
-
|
|
204
|
-
self.
|
|
205
|
-
self.assertEqual(content, "Page 1\nPage 2\n")
|
|
202
|
+
content = convert_file(odt_blob_file, fmt="txt", renderer=renderer)
|
|
203
|
+
self.assertIn("Page 1\nPage 2\n", content)
|
|
206
204
|
|
|
207
205
|
# convert to html
|
|
208
|
-
|
|
209
|
-
self.assertEqual(output_name, u"test_file.html")
|
|
206
|
+
content = convert_file(odt_blob_file, fmt="html", renderer=renderer)
|
|
210
207
|
self.assertTrue(content.startswith("<!DOCTYPE html>"))
|
|
211
208
|
self.assertIn("<html>", content)
|
|
212
209
|
self.assertIn("<body", content)
|
|
@@ -242,3 +239,32 @@ class TestUtils(PODTemplateIntegrationTest):
|
|
|
242
239
|
self.assertEqual(code, 1)
|
|
243
240
|
self.assertEqual(nb, 0)
|
|
244
241
|
self.assertTrue(result.strip().endswith("zipfile.BadZipfile: File is not a zip file"))
|
|
242
|
+
|
|
243
|
+
def test_get_original_template(self):
|
|
244
|
+
# No annotation
|
|
245
|
+
doc = api.content.create(container=self.portal, type='Document', id='doc1')
|
|
246
|
+
self.assertIsNone(get_original_template(doc))
|
|
247
|
+
|
|
248
|
+
# With template_uid annotation
|
|
249
|
+
template = self.portal.podtemplates.get('test_template_multiple')
|
|
250
|
+
annot = IAnnotations(doc)
|
|
251
|
+
annot["documentgenerator"] = {"template_uid": template.UID()}
|
|
252
|
+
self.assertEqual(get_original_template(doc), template)
|
|
253
|
+
|
|
254
|
+
# Mailed document with from_doc_uid
|
|
255
|
+
doc2 = api.content.create(container=self.portal, type='Document', id='doc2')
|
|
256
|
+
annot2 = IAnnotations(doc2)
|
|
257
|
+
annot2["documentgenerator"] = {"mailed": True, "from_doc_uid": doc.UID()}
|
|
258
|
+
self.assertEqual(get_original_template(doc2), template)
|
|
259
|
+
|
|
260
|
+
# Mailed document without from_doc_uid
|
|
261
|
+
doc3 = api.content.create(container=self.portal, type='Document', id='doc3')
|
|
262
|
+
annot3 = IAnnotations(doc3)
|
|
263
|
+
annot3["documentgenerator"] = {"mailed": True}
|
|
264
|
+
self.assertIsNone(get_original_template(doc3))
|
|
265
|
+
|
|
266
|
+
# With invalid template_uid
|
|
267
|
+
doc4 = api.content.create(container=self.portal, type='Document', id='doc4')
|
|
268
|
+
annot4 = IAnnotations(doc4)
|
|
269
|
+
annot4["documentgenerator"] = {"template_uid": "invalid-uid"}
|
|
270
|
+
self.assertIsNone(get_original_template(doc4))
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
# -*- coding: utf-8 -*-
|
|
2
2
|
from appy.bin.odfclean import Cleaner
|
|
3
|
-
from appy.pod.lo_pool import LoPool
|
|
4
3
|
from appy.pod.renderer import Renderer
|
|
5
4
|
from collective.documentgenerator import _
|
|
6
5
|
from collective.documentgenerator import BLDT_DIR
|
|
7
6
|
from collective.documentgenerator import config
|
|
7
|
+
from collective.documentgenerator.config import CONVSCRIPT
|
|
8
8
|
from collective.documentgenerator.config import DEFAULT_OO_PORT
|
|
9
9
|
from collective.documentgenerator.config import get_oo_port_list
|
|
10
10
|
from collective.documentgenerator.config import get_oo_server
|
|
@@ -228,68 +228,71 @@ def clean_notes(pod_template):
|
|
|
228
228
|
return bool(cleaned)
|
|
229
229
|
|
|
230
230
|
|
|
231
|
-
def convert_odt(afile,
|
|
231
|
+
def convert_odt(afile, fmt='pdf', gen_context=None, delete_temp_files=True, **kwargs):
|
|
232
232
|
"""
|
|
233
233
|
Convert an odt file to another format using appy.pod.
|
|
234
234
|
|
|
235
235
|
:param afile: file field content like NamedBlobFile
|
|
236
|
-
:param output_name: output name
|
|
237
236
|
:param fmt: output format, default to 'pdf'
|
|
237
|
+
:param gen_context: generation context dict passed to renderer
|
|
238
|
+
:param delete_temp_files: deletes input and output temporary files
|
|
238
239
|
:param kwargs: other parameters passed to Renderer, i.e pdfOptions='ExportNotes=True;SelectPdfVersion=1'
|
|
240
|
+
:return: converted file content
|
|
239
241
|
"""
|
|
240
|
-
lo_pool = LoPool.get(
|
|
241
|
-
python=config.get_uno_path(),
|
|
242
|
-
server=config.get_oo_server(),
|
|
243
|
-
port=config.get_oo_port_list(),
|
|
244
|
-
)
|
|
245
|
-
if not lo_pool:
|
|
246
|
-
raise Exception("Could not find LibreOffice, check your configuration")
|
|
247
|
-
|
|
248
242
|
temp_file = create_temporary_file(afile, '.odt')
|
|
249
|
-
converted_filename =
|
|
243
|
+
converted_filename = temporary_file_name(suffix=".{extension}".format(extension=fmt))
|
|
244
|
+
if not gen_context:
|
|
245
|
+
gen_context = {}
|
|
250
246
|
try:
|
|
251
247
|
renderer = Renderer(
|
|
252
|
-
temp_file.name,
|
|
253
|
-
|
|
254
|
-
|
|
248
|
+
temp_file.name, # could be StringIO(afile.data)
|
|
249
|
+
gen_context,
|
|
250
|
+
converted_filename,
|
|
251
|
+
pythonWithUnoPath=config.get_uno_path(),
|
|
252
|
+
ooServer=config.get_oo_server(),
|
|
253
|
+
ooPort=config.get_oo_port_list(),
|
|
254
|
+
raiseOnError=True,
|
|
255
|
+
forceOoCall=True,
|
|
255
256
|
**kwargs
|
|
256
257
|
)
|
|
258
|
+
if "view" in gen_context:
|
|
259
|
+
gen_context["view"]._set_appy_renderer(renderer)
|
|
257
260
|
|
|
258
|
-
|
|
259
|
-
converted_filename = temp_file.name.replace('.odt', '.{}'.format(fmt))
|
|
261
|
+
renderer.run()
|
|
260
262
|
if not os.path.exists(converted_filename):
|
|
261
263
|
api.portal.show_message(
|
|
262
|
-
message=_(u"Conversion failed, no converted file '{}'".format(safe_unicode(
|
|
264
|
+
message=_(u"Conversion failed, no converted file '{}'".format(safe_unicode(converted_filename))),
|
|
263
265
|
request=getSite().REQUEST,
|
|
264
266
|
type="error",
|
|
265
267
|
)
|
|
266
|
-
raise Invalid(u"Conversion failed, no converted file '{}'".format(safe_unicode(
|
|
268
|
+
raise Invalid(u"Conversion failed, no converted file '{}'".format(safe_unicode(converted_filename)))
|
|
267
269
|
with open(converted_filename, 'rb') as f:
|
|
268
270
|
converted_file = f.read()
|
|
269
271
|
finally:
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
272
|
+
if delete_temp_files:
|
|
273
|
+
remove_tmp_file(temp_file.name)
|
|
274
|
+
if converted_filename:
|
|
275
|
+
remove_tmp_file(converted_filename)
|
|
273
276
|
|
|
274
|
-
return
|
|
277
|
+
return converted_file
|
|
275
278
|
|
|
276
279
|
|
|
277
|
-
def convert_file(afile,
|
|
280
|
+
def convert_file(afile, fmt="pdf", renderer=False, gen_context=None, delete_temp_files=True):
|
|
278
281
|
"""
|
|
279
282
|
Convert a file to another libreoffice readable format using appy.pod
|
|
280
283
|
|
|
281
284
|
:param afile: file field content like NamedBlobFile
|
|
282
|
-
:param output_name: output name
|
|
283
285
|
:param fmt: output format, default to "pdf"
|
|
284
286
|
:param renderer: whether to use appy.pod Renderer or converter script. Default to False.
|
|
287
|
+
:param gen_context: generation context dict passed to renderer
|
|
288
|
+
:param delete_temp_files:
|
|
285
289
|
"""
|
|
286
290
|
if renderer:
|
|
287
291
|
if not afile.filename.endswith('.odt'):
|
|
288
292
|
message = _(u"Conversion with renderer only works from odt files.")
|
|
289
293
|
raise Invalid(message)
|
|
290
|
-
return convert_odt(afile,
|
|
291
|
-
|
|
292
|
-
converter_path = converter.__file__.endswith(".pyc") and converter.__file__[:-1] or converter.__file__
|
|
294
|
+
return convert_odt(afile, fmt=fmt, gen_context=gen_context, delete_temp_files=delete_temp_files)
|
|
295
|
+
|
|
293
296
|
file_ext = afile.filename.split('.')[-1].lower()
|
|
294
297
|
temp_file = create_temporary_file(afile, base_name=".{}".format(file_ext))
|
|
295
298
|
converted_filename = temp_file.name.replace(".{}".format(file_ext), ".{}".format(fmt))
|
|
@@ -298,25 +301,27 @@ def convert_file(afile, output_name, fmt="pdf", renderer=False):
|
|
|
298
301
|
ports = get_oo_port_list()
|
|
299
302
|
port = ports[0] if ports else DEFAULT_OO_PORT
|
|
300
303
|
command = "{python_uno_path} {converter_path} {temp_file} {fmt} -p {port} -e {server}".format(
|
|
301
|
-
python_uno_path=get_uno_path(), converter_path=
|
|
304
|
+
python_uno_path=get_uno_path(), converter_path=CONVSCRIPT, temp_file=temp_file.name, fmt=fmt,
|
|
302
305
|
port=port, server=get_oo_server())
|
|
303
306
|
out, err, code = runCommand(command)
|
|
304
307
|
# This command has no output on success
|
|
305
308
|
if code != 0 or err or not os.path.exists(converted_filename):
|
|
306
|
-
message = _(u"Conversion failed, no converted file '{}'".format(safe_unicode(
|
|
309
|
+
message = _(u"Conversion failed, no converted file '{}'".format(safe_unicode(converted_filename)))
|
|
307
310
|
raise Invalid(message)
|
|
308
311
|
with open(converted_filename, 'rb') as f:
|
|
309
312
|
converted_file = f.read()
|
|
310
313
|
except Exception as e:
|
|
311
314
|
api.portal.show_message(message=str(e), request=getSite().REQUEST, type="error")
|
|
312
315
|
finally:
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
316
|
+
if delete_temp_files:
|
|
317
|
+
remove_tmp_file(temp_file.name)
|
|
318
|
+
if os.path.exists(converted_filename):
|
|
319
|
+
remove_tmp_file(converted_filename)
|
|
320
|
+
return converted_file
|
|
317
321
|
|
|
318
322
|
|
|
319
|
-
def convert_and_save_file(afile, container, portal_type, output_name, fmt='pdf', from_uid=None, attributes=None,
|
|
323
|
+
def convert_and_save_file(afile, container, portal_type, output_name, fmt='pdf', from_uid=None, attributes=None,
|
|
324
|
+
renderer=False, gen_context=None):
|
|
320
325
|
"""
|
|
321
326
|
Convert a file to another libreoffice readable format using appy.pod and save it in a NamedBlobFile.
|
|
322
327
|
|
|
@@ -328,16 +333,17 @@ def convert_and_save_file(afile, container, portal_type, output_name, fmt='pdf',
|
|
|
328
333
|
:param from_uid: uid from original file object
|
|
329
334
|
:param attributes: dict of other attributes to set on created content
|
|
330
335
|
:param renderer: whether to use appy.pod Renderer or converter script. Default to False.
|
|
336
|
+
:param gen_context: generation context dict passed to renderer
|
|
331
337
|
"""
|
|
332
|
-
|
|
333
|
-
file_object = NamedBlobFile(converted_file, filename=safe_unicode(
|
|
338
|
+
converted_file = convert_file(afile, fmt=fmt, gen_context=gen_context, renderer=renderer)
|
|
339
|
+
file_object = NamedBlobFile(converted_file, filename=safe_unicode(output_name))
|
|
334
340
|
if attributes is None:
|
|
335
341
|
attributes = {}
|
|
336
342
|
attributes["conv_from_uid"] = from_uid
|
|
337
343
|
new_file = createContentInContainer(
|
|
338
344
|
container,
|
|
339
345
|
portal_type,
|
|
340
|
-
title=
|
|
346
|
+
title=safe_unicode(output_name),
|
|
341
347
|
file=file_object,
|
|
342
348
|
**attributes)
|
|
343
349
|
if from_uid:
|
|
@@ -346,6 +352,30 @@ def convert_and_save_file(afile, container, portal_type, output_name, fmt='pdf',
|
|
|
346
352
|
return new_file
|
|
347
353
|
|
|
348
354
|
|
|
355
|
+
def get_original_template(obj):
|
|
356
|
+
"""
|
|
357
|
+
Get the original template used to generate a document.
|
|
358
|
+
|
|
359
|
+
:param obj: generated document
|
|
360
|
+
:return: template object or None
|
|
361
|
+
"""
|
|
362
|
+
obj_annot = IAnnotations(obj).get("documentgenerator", {})
|
|
363
|
+
if not obj_annot:
|
|
364
|
+
return None
|
|
365
|
+
template_uid = None
|
|
366
|
+
if obj_annot.get("mailed", False): # mailed documents, template_uid is mailing template uid
|
|
367
|
+
if "from_doc_uid" not in obj_annot:
|
|
368
|
+
return None
|
|
369
|
+
doc = uuidToObject(obj_annot["from_doc_uid"], unrestricted=True)
|
|
370
|
+
doc_annot = IAnnotations(doc).get("documentgenerator", {})
|
|
371
|
+
template_uid = doc_annot.get("template_uid", None)
|
|
372
|
+
else:
|
|
373
|
+
template_uid = obj_annot.get("template_uid", None)
|
|
374
|
+
if template_uid:
|
|
375
|
+
return uuidToObject(template_uid, unrestricted=True)
|
|
376
|
+
return None
|
|
377
|
+
|
|
378
|
+
|
|
349
379
|
@api.env.mutually_exclusive_parameters("document", "document_uid")
|
|
350
380
|
def need_mailing_value(document=None, document_uid=None):
|
|
351
381
|
if not document:
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: collective.documentgenerator
|
|
3
|
-
Version: 3.
|
|
3
|
+
Version: 3.47.1
|
|
4
4
|
Summary: Desktop document generation (.odt, .pdf, .doc, ...) based on appy framework (https://appyframe.work/tool/public) and OpenOffice/LibreOffice
|
|
5
5
|
Home-page: https://pypi.org/project/collective.documentgenerator
|
|
6
6
|
Author: Simon Delcourt
|
|
@@ -216,6 +216,24 @@ The project is licensed under the GPLv2.
|
|
|
216
216
|
Changelog
|
|
217
217
|
=========
|
|
218
218
|
|
|
219
|
+
3.47.1 (2026-03-26)
|
|
220
|
+
-------------------
|
|
221
|
+
|
|
222
|
+
- Moved CONVSCRIPT to config.py
|
|
223
|
+
[chris-adam]
|
|
224
|
+
|
|
225
|
+
3.47 (2026-03-03)
|
|
226
|
+
-----------------
|
|
227
|
+
|
|
228
|
+
- Used renderer.run in `utils.convert_odt` and added gen_context as param.
|
|
229
|
+
[sgeulette]
|
|
230
|
+
- Added "from_doc_uid" in generated doc annotation after MailingLoopPersistentDocumentGenerationView call.
|
|
231
|
+
[sgeulette]
|
|
232
|
+
- Added `utils.get_original_template` to get the original pod template, even after a mailing loop generation,
|
|
233
|
+
[sgeulette]
|
|
234
|
+
- Simplified `utils.convert_odt` and `utils.convert_file` parameters and returned value.
|
|
235
|
+
[sgeulette]
|
|
236
|
+
|
|
219
237
|
3.46 (2026-01-15)
|
|
220
238
|
-----------------
|
|
221
239
|
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/docs/developer.rst
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
{collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/docs/images/demoInstal.png
RENAMED
|
File without changes
|
|
File without changes
|
{collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/docs/images/viewlet.png
RENAMED
|
File without changes
|
{collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/docs/search_replace.rst
RENAMED
|
File without changes
|
{collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/docs/technical.rst
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
{collective_documentgenerator-3.46 → collective_documentgenerator-3.47.1}/src/collective/__init__.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|