collective.documentgenerator 3.49__tar.gz → 3.50__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.49 → collective_documentgenerator-3.50}/CHANGES.rst +8 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/MANIFEST.in +1 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/PKG-INFO +9 -1
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/setup.py +1 -1
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/browser/configure.zcml +27 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/browser/resources/css/documentgenerator.css +20 -3
- collective_documentgenerator-3.50/src/collective/documentgenerator/browser/sub_templates_usage.pt +25 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/browser/table.py +123 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/browser/templates_listing.pt +2 -2
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/browser/views.py +16 -2
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/content/vocabulary.py +11 -1
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/content/vocabulary.zcml +8 -0
- collective_documentgenerator-3.50/src/collective/documentgenerator/tests/test_sub_templates_usage_view.py +165 -0
- collective_documentgenerator-3.50/src/collective/documentgenerator/tests/test_viewlets.py +69 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/tests/test_vocabulary.py +19 -0
- collective_documentgenerator-3.50/src/collective/documentgenerator/viewlets/sub_template_usage.pt +11 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/viewlets/sub_template_usage.py +13 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective.documentgenerator.egg-info/PKG-INFO +9 -1
- collective_documentgenerator-3.49/src/collective/documentgenerator/browser/sub_templates_usage.pt +0 -62
- collective_documentgenerator-3.49/src/collective/documentgenerator/tests/test_sub_templates_usage_view.py +0 -51
- collective_documentgenerator-3.49/src/collective/documentgenerator/tests/test_viewlets.py +0 -29
- collective_documentgenerator-3.49/src/collective/documentgenerator/viewlets/sub_template_usage.pt +0 -32
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/.coveragerc +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/.isort.cfg +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/.tx/config +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/Makefile +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/README.rst +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/buildout.cfg +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/docs/LICENSE.GPL +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/docs/LICENSE.rst +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/docs/developer.rst +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/docs/images/AddPODTTemplateMenu.png +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/docs/images/addPloneSite.png +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/docs/images/demoInstal.png +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/docs/images/documentgenerator-searchreplacepanel.png +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/docs/images/viewlet.png +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/docs/search_replace.rst +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/docs/technical.rst +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/docs/user.rst +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/setup.cfg +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/__init__.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/AT_renderer.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/DX_renderer.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/__init__.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/adapters.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/browser/__init__.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/browser/actionspanel.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/browser/check_pod_templates.pt +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/browser/children_pod_template.pt +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/browser/controlpanel.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/browser/converter.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/browser/generation_view.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/browser/overrides.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/browser/static/.gitkeep +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/browser/static/configurable.svg +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/browser/static/csv.svg +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/browser/static/doc.svg +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/browser/static/docx.svg +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/browser/static/download_icon.svg +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/browser/static/libreoffice-blanck.svg +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/browser/static/mailinglooptemplate.svg +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/browser/static/missing_use.svg +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/browser/static/nok.svg +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/browser/static/nok_use.svg +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/browser/static/nok_used.svg +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/browser/static/odp.svg +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/browser/static/ods.svg +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/browser/static/odt.svg +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/browser/static/ok.svg +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/browser/static/ok_use.svg +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/browser/static/ok_used.svg +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/browser/static/pdf.svg +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/browser/static/podtemplate.svg +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/browser/static/rtf.svg +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/browser/static/style.svg +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/browser/static/subtemplate.svg +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/browser/static/xls.svg +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/browser/static/xlsx.svg +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/config.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/configure.zcml +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/content/__init__.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/content/condition.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/content/conditions.zcml +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/content/configure.zcml +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/content/document_factory.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/content/file_representation.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/content/file_representation.zcml +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/content/merge_templates.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/content/merge_templates.zcml +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/content/pod_template.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/content/style_template.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/demo/__init__.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/demo/archetypes.zcml +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/demo/configure.zcml +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/demo/helper.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/events/__init__.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/events/configure.zcml +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/events/pod_templates_events.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/events/styles_events.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/helper/__init__.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/helper/archetypes-adapter.zcml +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/helper/archetypes-page.zcml +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/helper/archetypes.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/helper/base.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/helper/configure.zcml +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/helper/dexterity.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/interfaces.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/locales/collective.documentgenerator.pot +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/locales/es/LC_MESSAGES/collective.documentgenerator.po +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/locales/es/LC_MESSAGES/plone.po +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/locales/fr/LC_MESSAGES/collective.documentgenerator.po +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/locales/fr/LC_MESSAGES/plone.po +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/locales/manual.pot +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/locales/plone-manual.pot +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/locales/plone.pot +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/locales/update.sh +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/migrations/__init__.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/migrations/migrate_to_11.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/migrations/migrate_to_12.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/migrations/migrate_to_13.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/migrations/migrate_to_16.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/migrations/migrate_to_3.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/migrations/migrate_to_5.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/migrations/migrate_to_6.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/migrations/migrate_to_7.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/migrations/migrate_to_8.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/migrations/migrate_to_9.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/profiles/base/browserlayer.xml +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/profiles/base/controlpanel.xml +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/profiles/base/metadata.xml +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/profiles/base/types/ConfigurablePODTemplate.xml +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/profiles/base/types/MailingLoopTemplate.xml +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/profiles/base/types/PODTemplate.xml +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/profiles/base/types/StyleTemplate.xml +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/profiles/base/types/SubTemplate.xml +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/profiles/base/types.xml +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/profiles/base/viewlets.xml +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/profiles/demo/browserlayer.xml +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/profiles/demo/collectivedocumentgenerator_demo_marker.txt +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/profiles/demo/import_steps.xml +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/profiles/demo/metadata.xml +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/profiles/demo/registry.xml +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/profiles/demo/templates/mailing.odt +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/profiles/demo/templates/modele_general.ods +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/profiles/demo/templates/modele_general.odt +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/profiles/demo/templates/mod/303/250le_collection.odt" +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/profiles/demo/templates/possibly_mailed_model.odt +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/profiles/demo/templates/styles.odt +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/profiles/demo/templates/styles_2.odt +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/profiles/demo/templates/sub_template.odt +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/profiles/demo/viewlets.xml +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/profiles/plone4/collectivedocumentgenerator_marker.txt +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/profiles/plone4/cssregistry.xml +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/profiles/plone4/metadata.xml +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/profiles/plone4/registry.xml +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/profiles/plone5/metadata.xml +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/profiles/plone5/registry.xml +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/profiles/testing/metadata.xml +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/profiles/testing/propertiestool.xml +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/profiles/testing/types/member.xml +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/profiles/testing/types.xml +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/profiles.zcml +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/renderer.zcml +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/search_replace/__init__.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/search_replace/configure.zcml +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/search_replace/pod_template.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/search_replace/search_result_form.pt +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/search_replace/searchreplace_panel.pt +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/search_replace/searchreplace_panel.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/setuphandlers.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/testing.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/testing.zcml +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/tests/__init__.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/tests/failing_template.odt +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/tests/robot/.gitkeep +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/tests/template_to_clean.odt +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/tests/template_without_style_page.odt +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/tests/test_AT_helper_view.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/tests/test_DX_helper_view.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/tests/test_base_helper_view.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/tests/test_check_podtemplates_view.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/tests/test_config.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/tests/test_configurable_pod_template.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/tests/test_demo_profile.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/tests/test_events.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/tests/test_file.odt +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/tests/test_generation_view.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/tests/test_mailing.odt +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/tests/test_mailing_loop_template.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/tests/test_pod_template.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/tests/test_robot.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/tests/test_search_replace.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/tests/test_setup.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/tests/test_style_template.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/tests/test_sub_template.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/tests/test_templates_listing_view.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/tests/test_utils.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/utils.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/viewlets/__init__.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/viewlets/batchactions.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/viewlets/configure.zcml +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/viewlets/generationlinks.pt +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective/documentgenerator/viewlets/generationlinks.py +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective.documentgenerator.egg-info/SOURCES.txt +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective.documentgenerator.egg-info/dependency_links.txt +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective.documentgenerator.egg-info/entry_points.txt +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective.documentgenerator.egg-info/namespace_packages.txt +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective.documentgenerator.egg-info/not-zip-safe +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective.documentgenerator.egg-info/requires.txt +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/src/collective.documentgenerator.egg-info/top_level.txt +0 -0
- {collective_documentgenerator-3.49 → collective_documentgenerator-3.50}/test-ci.cfg +0 -0
|
@@ -1,6 +1,14 @@
|
|
|
1
1
|
Changelog
|
|
2
2
|
=========
|
|
3
3
|
|
|
4
|
+
3.50 (2026-11-16)
|
|
5
|
+
-----------------
|
|
6
|
+
|
|
7
|
+
- Removed the duplicated "no value" option of the `style_template` field. (MOD-1080)
|
|
8
|
+
[chris-adam]
|
|
9
|
+
- Converted sub-templates usage view and viewlet to z3c.table and displayed the merge variable name. (PARAF-512)
|
|
10
|
+
[chris-adam,sgeulette]
|
|
11
|
+
|
|
4
12
|
3.49 (2026-07-31)
|
|
5
13
|
-----------------
|
|
6
14
|
|
|
@@ -10,6 +10,7 @@ exclude .installed.cfg
|
|
|
10
10
|
exclude .mr.developer.cfg
|
|
11
11
|
exclude buildout.d
|
|
12
12
|
exclude requirements.txt
|
|
13
|
+
exclude src/collective/documentgenerator/locales/rebuild_i18n.log
|
|
13
14
|
recursive-exclude buildout.d *.cfg
|
|
14
15
|
recursive-include docs *.GPL
|
|
15
16
|
recursive-include docs *.png
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: collective.documentgenerator
|
|
3
|
-
Version: 3.
|
|
3
|
+
Version: 3.50
|
|
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
|
|
@@ -229,6 +229,14 @@ The project is licensed under the GPLv2.
|
|
|
229
229
|
Changelog
|
|
230
230
|
=========
|
|
231
231
|
|
|
232
|
+
3.50 (2026-11-16)
|
|
233
|
+
-----------------
|
|
234
|
+
|
|
235
|
+
- Removed the duplicated "no value" option of the `style_template` field. (MOD-1080)
|
|
236
|
+
[chris-adam]
|
|
237
|
+
- Converted sub-templates usage view and viewlet to z3c.table and displayed the merge variable name. (PARAF-512)
|
|
238
|
+
[chris-adam,sgeulette]
|
|
239
|
+
|
|
232
240
|
3.49 (2026-07-31)
|
|
233
241
|
-----------------
|
|
234
242
|
|
|
@@ -11,7 +11,7 @@ long_description = (
|
|
|
11
11
|
|
|
12
12
|
setup(
|
|
13
13
|
name='collective.documentgenerator',
|
|
14
|
-
version='3.
|
|
14
|
+
version='3.50',
|
|
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
|
|
@@ -198,6 +198,33 @@
|
|
|
198
198
|
factory=".table.DownloadColumn"
|
|
199
199
|
/>
|
|
200
200
|
|
|
201
|
+
<adapter
|
|
202
|
+
name="SubTemplateColumn"
|
|
203
|
+
for="zope.interface.Interface
|
|
204
|
+
zope.interface.Interface
|
|
205
|
+
.table.SubTemplatesUsageTable"
|
|
206
|
+
provides="z3c.table.interfaces.IColumn"
|
|
207
|
+
factory=".table.SubTemplateColumn"
|
|
208
|
+
/>
|
|
209
|
+
|
|
210
|
+
<adapter
|
|
211
|
+
name="SubTemplateUsagePathColumn"
|
|
212
|
+
for="zope.interface.Interface
|
|
213
|
+
zope.interface.Interface
|
|
214
|
+
.table.SubTemplatesUsageTable"
|
|
215
|
+
provides="z3c.table.interfaces.IColumn"
|
|
216
|
+
factory=".table.SubTemplateUsagePathColumn"
|
|
217
|
+
/>
|
|
218
|
+
|
|
219
|
+
<adapter
|
|
220
|
+
name="SubTemplateUsageTemplatesColumn"
|
|
221
|
+
for="zope.interface.Interface
|
|
222
|
+
zope.interface.Interface
|
|
223
|
+
.table.SubTemplatesUsageTable"
|
|
224
|
+
provides="z3c.table.interfaces.IColumn"
|
|
225
|
+
factory=".table.SubTemplateUsageTemplatesColumn"
|
|
226
|
+
/>
|
|
227
|
+
|
|
201
228
|
<!-- batchactions -->
|
|
202
229
|
<browser:viewlet
|
|
203
230
|
zcml:condition="installed collective.eeafaceted.batchactions"
|
|
@@ -20,16 +20,16 @@ div#doc-generation-view {
|
|
|
20
20
|
line-height: 1.1em !important;
|
|
21
21
|
}
|
|
22
22
|
|
|
23
|
-
.template-dg-templates-listing
|
|
23
|
+
.template-dg-templates-listing .dg-batch {
|
|
24
24
|
padding-bottom: 0.15em;
|
|
25
25
|
}
|
|
26
26
|
|
|
27
|
-
.template-dg-templates-listing
|
|
27
|
+
.template-dg-templates-listing .dg-batch a {
|
|
28
28
|
border: 1px solid #CCCCCC !important;
|
|
29
29
|
padding: 0.15em;
|
|
30
30
|
}
|
|
31
31
|
|
|
32
|
-
.template-dg-templates-listing
|
|
32
|
+
.template-dg-templates-listing .dg-batch a.current{
|
|
33
33
|
border: 0px !important;
|
|
34
34
|
}
|
|
35
35
|
|
|
@@ -131,3 +131,20 @@ span.template-link-before-link img {
|
|
|
131
131
|
margin:3px;
|
|
132
132
|
vertical-align: middle;
|
|
133
133
|
}
|
|
134
|
+
|
|
135
|
+
/* sub-templates usage: the merge variable, below the sub-template name */
|
|
136
|
+
.sub-templates-usage .pod-context-name {
|
|
137
|
+
color: #8d8d8d;
|
|
138
|
+
font-size: 90%;
|
|
139
|
+
}
|
|
140
|
+
|
|
141
|
+
/* the using templates disagree on the variable name */
|
|
142
|
+
.sub-templates-usage td.conflicting-variables {
|
|
143
|
+
background-color: #B3004B;
|
|
144
|
+
}
|
|
145
|
+
|
|
146
|
+
.sub-templates-usage td.conflicting-variables,
|
|
147
|
+
.sub-templates-usage td.conflicting-variables a,
|
|
148
|
+
.sub-templates-usage td.conflicting-variables .pod-context-name {
|
|
149
|
+
color: #fff;
|
|
150
|
+
}
|
collective_documentgenerator-3.50/src/collective/documentgenerator/browser/sub_templates_usage.pt
ADDED
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
|
|
2
|
+
xmlns:tal="http://xml.zope.org/namespaces/tal"
|
|
3
|
+
xmlns:metal="http://xml.zope.org/namespaces/metal"
|
|
4
|
+
xmlns:i18n="http://xml.zope.org/namespaces/i18n"
|
|
5
|
+
lang="en"
|
|
6
|
+
metal:use-macro="context/main_template/macros/master"
|
|
7
|
+
i18n:domain="collective.documentgenerator">
|
|
8
|
+
<body>
|
|
9
|
+
|
|
10
|
+
<metal:main fill-slot="main">
|
|
11
|
+
|
|
12
|
+
<h1 class="documentFirstHeading" i18n:translate="sub_templates_usage_title">Sub-templates usages</h1>
|
|
13
|
+
|
|
14
|
+
<div id="content-core">
|
|
15
|
+
<tal:block define="results view/table/values" tal:condition="results">
|
|
16
|
+
<div class="dg-batch"><tal:batch replace="structure view/table/renderBatch" /></div>
|
|
17
|
+
<tal:listing replace="structure view/table/render" />
|
|
18
|
+
<div class="dg-batch"><tal:batch replace="structure view/table/renderBatch" /></div>
|
|
19
|
+
</tal:block>
|
|
20
|
+
</div>
|
|
21
|
+
|
|
22
|
+
</metal:main>
|
|
23
|
+
|
|
24
|
+
</body>
|
|
25
|
+
</html>
|
|
@@ -275,3 +275,126 @@ class DownloadColumn(NoEscapeLinkColumn):
|
|
|
275
275
|
safe_unicode(translate(PMF('Download'), context=self.request)),
|
|
276
276
|
u'%s/++resource++collective.documentgenerator/download_icon.svg' % self.table.portal_url)
|
|
277
277
|
return down_img
|
|
278
|
+
|
|
279
|
+
|
|
280
|
+
class SubTemplatesUsageTable(Table):
|
|
281
|
+
"""Table that displays sub-templates and the templates using them."""
|
|
282
|
+
|
|
283
|
+
cssClassEven = u'even'
|
|
284
|
+
cssClassOdd = u'odd'
|
|
285
|
+
cssClasses = {'table': 'listing nosort sub-templates-usage'}
|
|
286
|
+
|
|
287
|
+
batchSize = 200
|
|
288
|
+
startBatchingAt = 200
|
|
289
|
+
sortOn = None
|
|
290
|
+
results = []
|
|
291
|
+
|
|
292
|
+
@CachedProperty
|
|
293
|
+
def values(self):
|
|
294
|
+
return self.results
|
|
295
|
+
|
|
296
|
+
def getCSSHighlightClass(self, column, item, cssClass):
|
|
297
|
+
"""Flag the sub-template cell when its using templates disagree on the variable name."""
|
|
298
|
+
if isinstance(column, SubTemplateColumn) and len(item['pod_context_names']) > 1:
|
|
299
|
+
return u'{0} conflicting-variables'.format(cssClass or u'').strip()
|
|
300
|
+
return cssClass
|
|
301
|
+
|
|
302
|
+
|
|
303
|
+
class SubTemplateUsageTable(SubTemplatesUsageTable):
|
|
304
|
+
"""Usage table variant for the viewlet, where the sub-template is the context."""
|
|
305
|
+
|
|
306
|
+
hidden_columns = ('SubTemplateColumn', )
|
|
307
|
+
|
|
308
|
+
def setUpColumns(self):
|
|
309
|
+
columns = super(SubTemplateUsageTable, self).setUpColumns()
|
|
310
|
+
return [col for col in columns if col.__name__ not in self.hidden_columns]
|
|
311
|
+
|
|
312
|
+
|
|
313
|
+
class SubTemplateColumn(Column):
|
|
314
|
+
"""Column that displays the sub-template and the variable it is merged under."""
|
|
315
|
+
|
|
316
|
+
header = _(u'sub_template_usage_sub_template', default=u'Sub-template')
|
|
317
|
+
weight = 10
|
|
318
|
+
cssClasses = {'td': 'sub-template-column'}
|
|
319
|
+
|
|
320
|
+
def render_sub_template(self, item):
|
|
321
|
+
"""Return the cell content for the sub-template of `item`, without its variable."""
|
|
322
|
+
brain = item['sub_template']
|
|
323
|
+
link = u'<a href="{0}">{1}</a>'.format(brain.getURL(), escape(safe_unicode(brain.Title)))
|
|
324
|
+
if item['rel_path']:
|
|
325
|
+
return u'<span>{0}</span> / {1}'.format(escape(item['rel_path']), link)
|
|
326
|
+
return link
|
|
327
|
+
|
|
328
|
+
def renderCell(self, item):
|
|
329
|
+
if not item['first']:
|
|
330
|
+
return u''
|
|
331
|
+
cell = self.render_sub_template(item)
|
|
332
|
+
names = item['pod_context_names']
|
|
333
|
+
if names:
|
|
334
|
+
cell += u'<div class="pod-context-name">{0}</div>'.format(escape(u', '.join(names)))
|
|
335
|
+
return cell
|
|
336
|
+
|
|
337
|
+
|
|
338
|
+
class SubTemplateUsagePathColumn(Column):
|
|
339
|
+
"""Column that displays the path of the templates using the sub-template."""
|
|
340
|
+
|
|
341
|
+
header = _(u'sub_template_usage_path', default=u'Path')
|
|
342
|
+
weight = 20
|
|
343
|
+
cssClasses = {'td': 'usage-path-column'}
|
|
344
|
+
|
|
345
|
+
def renderCell(self, item):
|
|
346
|
+
if item['group'] is None:
|
|
347
|
+
return u'-'
|
|
348
|
+
return escape(safe_unicode(item['group']['title_path']))
|
|
349
|
+
|
|
350
|
+
|
|
351
|
+
class SubTemplateUsageTemplatesColumn(Column):
|
|
352
|
+
"""Column that displays the templates using the sub-template."""
|
|
353
|
+
|
|
354
|
+
header = _(u'sub_template_usage_templates', default=u'Using templates')
|
|
355
|
+
weight = 30
|
|
356
|
+
cssClasses = {'td': 'using-templates-column'}
|
|
357
|
+
|
|
358
|
+
def renderCell(self, item):
|
|
359
|
+
if item['group'] is None:
|
|
360
|
+
return u'<em>{0}</em>'.format(translate(
|
|
361
|
+
_(u'sub_template_usage_not_used', default=u'not used'), context=self.request))
|
|
362
|
+
return u'<ul>{0}</ul>'.format(u''.join(
|
|
363
|
+
u'<li><a href="{0}">{1}</a></li>'.format(tmpl.absolute_url(), escape(safe_unicode(tmpl.Title())))
|
|
364
|
+
for tmpl in item['group']['templates']))
|
|
365
|
+
|
|
366
|
+
|
|
367
|
+
def get_pod_context_names(sub_template_uid, groups):
|
|
368
|
+
"""Return the distinct variable names the sub-template is merged under by the templates of `groups`.
|
|
369
|
+
|
|
370
|
+
More than one name means the using templates disagree on the variable name.
|
|
371
|
+
"""
|
|
372
|
+
names = []
|
|
373
|
+
for group in groups or []:
|
|
374
|
+
for template in group['templates']:
|
|
375
|
+
for line in getattr(template, 'merge_templates', None) or []:
|
|
376
|
+
if line.get('template') != sub_template_uid:
|
|
377
|
+
continue
|
|
378
|
+
name = line.get('pod_context_name') or u''
|
|
379
|
+
if name and name not in names:
|
|
380
|
+
names.append(name)
|
|
381
|
+
return names
|
|
382
|
+
|
|
383
|
+
|
|
384
|
+
def get_sub_template_usage_rows(entries):
|
|
385
|
+
"""Return the usage table rows for `entries`, one per (sub-template, path group).
|
|
386
|
+
|
|
387
|
+
A row carries the entry keys plus 'group' (None when the sub-template is used by no
|
|
388
|
+
template) and 'first' (False on a group continuation row, where the sub-template cell
|
|
389
|
+
stays empty since z3c.table has no rowspan). 'groups' is kept on every row so that a
|
|
390
|
+
cell can look at the whole sub-template, not only at its own group. 'pod_context_names'
|
|
391
|
+
is computed once per sub-template and shared by its rows.
|
|
392
|
+
"""
|
|
393
|
+
rows = []
|
|
394
|
+
for entry in entries:
|
|
395
|
+
names = get_pod_context_names(entry['sub_template_uid'], entry['groups'])
|
|
396
|
+
for i, group in enumerate(entry['groups'] or [None]):
|
|
397
|
+
rows.append({'sub_template': entry['sub_template'], 'rel_path': entry['rel_path'],
|
|
398
|
+
'sub_template_uid': entry['sub_template_uid'], 'group': group,
|
|
399
|
+
'groups': entry['groups'], 'first': i == 0, 'pod_context_names': names})
|
|
400
|
+
return rows
|
|
@@ -14,9 +14,9 @@
|
|
|
14
14
|
i18n:translate="sub_templates_usage_link">Sub-templates usage</a>
|
|
15
15
|
|
|
16
16
|
<tal:block define="results view/table/values;" tal:condition="results">
|
|
17
|
-
<div
|
|
17
|
+
<div class="dg-batch"><tal:batch replace="structure view/table/renderBatch" /></div>
|
|
18
18
|
<tal:listing replace="structure view/table/render" />
|
|
19
|
-
<div
|
|
19
|
+
<div class="dg-batch"><tal:batch replace="structure view/table/renderBatch" /></div>
|
|
20
20
|
</tal:block>
|
|
21
21
|
|
|
22
22
|
</metal:content-core>
|
|
@@ -2,6 +2,8 @@
|
|
|
2
2
|
from Acquisition import aq_inner
|
|
3
3
|
from Acquisition import aq_parent
|
|
4
4
|
from collections import OrderedDict
|
|
5
|
+
from collective.documentgenerator.browser.table import get_sub_template_usage_rows
|
|
6
|
+
from collective.documentgenerator.browser.table import SubTemplatesUsageTable
|
|
5
7
|
from collective.documentgenerator.browser.table import TemplatesTable
|
|
6
8
|
from collective.documentgenerator.content.pod_template import IPODTemplate
|
|
7
9
|
from collective.documentgenerator.content.pod_template import MailingLoopTemplate
|
|
@@ -106,6 +108,8 @@ class SubTemplatesUsage(BrowserView):
|
|
|
106
108
|
"""Overview listing, for each sub-template, the POD templates that use
|
|
107
109
|
it in their 'merge_templates' field, grouped by the path they live in."""
|
|
108
110
|
|
|
111
|
+
__table__ = SubTemplatesUsageTable
|
|
112
|
+
|
|
109
113
|
def sub_templates_usage(self):
|
|
110
114
|
"""Return a list of {'sub_template': brain, 'rel_path': unicode, 'groups': [...]}
|
|
111
115
|
entries, one per sub-template (including unused ones), ordered by the
|
|
@@ -120,8 +124,8 @@ class SubTemplatesUsage(BrowserView):
|
|
|
120
124
|
segments = get_path_segments(aq_parent(aq_inner(sub_template)))
|
|
121
125
|
all_segments.append(segments)
|
|
122
126
|
templates = get_pod_templates_using(sub_template)
|
|
123
|
-
result.append({"sub_template": brain, "
|
|
124
|
-
"groups": group_templates_by_path(templates)})
|
|
127
|
+
result.append({"sub_template": brain, "sub_template_uid": brain.UID,
|
|
128
|
+
"segments": segments, "groups": group_templates_by_path(templates)})
|
|
125
129
|
common = common_prefix_length([[seg[0] for seg in segs] for segs in all_segments])
|
|
126
130
|
for entry in result:
|
|
127
131
|
tail = entry.pop("segments")[common:]
|
|
@@ -130,6 +134,16 @@ class SubTemplatesUsage(BrowserView):
|
|
|
130
134
|
safe_unicode(e["sub_template"].Title).lower()))
|
|
131
135
|
return result
|
|
132
136
|
|
|
137
|
+
def update(self):
|
|
138
|
+
self.table = self.__table__(self.context, self.request)
|
|
139
|
+
self.table.__name__ = u"sub-templates-usage"
|
|
140
|
+
self.table.results = get_sub_template_usage_rows(self.sub_templates_usage())
|
|
141
|
+
self.table.update()
|
|
142
|
+
|
|
143
|
+
def __call__(self):
|
|
144
|
+
self.update()
|
|
145
|
+
return self.index()
|
|
146
|
+
|
|
133
147
|
|
|
134
148
|
class DisplayChildrenPodTemplateProvider(ContentProviderBase):
|
|
135
149
|
template = ViewPageTemplateFile("children_pod_template.pt")
|
|
@@ -10,6 +10,7 @@ from collective.documentgenerator.content.pod_template import IPODTemplate
|
|
|
10
10
|
from collective.documentgenerator.utils import get_site_root_relative_path
|
|
11
11
|
from plone import api
|
|
12
12
|
from Products.CMFPlone.utils import safe_unicode
|
|
13
|
+
from z3c.form.converter import CollectionSequenceDataConverter
|
|
13
14
|
from z3c.form.i18n import MessageFactory as _z3c_form
|
|
14
15
|
from z3c.form.interfaces import IContextAware
|
|
15
16
|
from z3c.form.interfaces import IDataManager
|
|
@@ -53,7 +54,7 @@ class StyleTemplatesVocabularyFactory(object):
|
|
|
53
54
|
def __call__(self, context):
|
|
54
55
|
catalog = api.portal.get_tool('portal_catalog')
|
|
55
56
|
style_template_brains = catalog(portal_type='StyleTemplate')
|
|
56
|
-
voc_terms = [
|
|
57
|
+
voc_terms = []
|
|
57
58
|
|
|
58
59
|
for brain in style_template_brains:
|
|
59
60
|
voc_terms.append(SimpleTerm(brain.UID,
|
|
@@ -313,3 +314,12 @@ class ConfigStreamVocabularyFactory(object):
|
|
|
313
314
|
]
|
|
314
315
|
|
|
315
316
|
return SimpleVocabulary(voc_terms)
|
|
317
|
+
|
|
318
|
+
|
|
319
|
+
class NoValueCollectionDataConverter(CollectionSequenceDataConverter):
|
|
320
|
+
"""Empties a collection field when the widget 'no value' option is submitted."""
|
|
321
|
+
|
|
322
|
+
def toFieldValue(self, value):
|
|
323
|
+
if not value or value[0] == self.widget.noValueToken:
|
|
324
|
+
return self.field.missing_value
|
|
325
|
+
return super(NoValueCollectionDataConverter, self).toFieldValue(value)
|
|
@@ -87,6 +87,14 @@
|
|
|
87
87
|
factory=".vocabulary.PTMCTV"
|
|
88
88
|
/>
|
|
89
89
|
|
|
90
|
+
<!-- 'No value' option of a select widget on a list field -->
|
|
91
|
+
<adapter
|
|
92
|
+
factory=".vocabulary.NoValueCollectionDataConverter"
|
|
93
|
+
for="zope.schema.interfaces.IList
|
|
94
|
+
z3c.form.interfaces.ISelectWidget"
|
|
95
|
+
provides="z3c.form.interfaces.IDataConverter"
|
|
96
|
+
/>
|
|
97
|
+
|
|
90
98
|
<!-- CSV field delimiter Vocabulary -->
|
|
91
99
|
<utility
|
|
92
100
|
factory=".vocabulary.CSVFieldDelimiterFactory"
|
|
@@ -0,0 +1,165 @@
|
|
|
1
|
+
# -*- coding: utf-8 -*-
|
|
2
|
+
|
|
3
|
+
from collective.documentgenerator.browser.table import get_pod_context_names
|
|
4
|
+
from collective.documentgenerator.browser.table import SubTemplateColumn
|
|
5
|
+
from collective.documentgenerator.browser.table import SubTemplateUsagePathColumn
|
|
6
|
+
from collective.documentgenerator.browser.table import SubTemplateUsageTemplatesColumn
|
|
7
|
+
from collective.documentgenerator.testing import PODTemplateIntegrationTest
|
|
8
|
+
from plone import api
|
|
9
|
+
from Products.CMFPlone.utils import _createObjectByType
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
class TestSubTemplatesUsageView(PODTemplateIntegrationTest):
|
|
13
|
+
"""Test the 'sub-templates-usage' view.
|
|
14
|
+
|
|
15
|
+
The demo profile creates a single 'sub_template' (title 'Header') in
|
|
16
|
+
'podtemplates', used by 'test_template_multiple' and 'test_template_bis'.
|
|
17
|
+
"""
|
|
18
|
+
|
|
19
|
+
def setUp(self):
|
|
20
|
+
super(TestSubTemplatesUsageView, self).setUp()
|
|
21
|
+
self.view = self.portal.restrictedTraverse("@@sub-templates-usage")
|
|
22
|
+
|
|
23
|
+
def _rows(self):
|
|
24
|
+
"""Add a second usage group for the demo sub-template and an unused sub-template.
|
|
25
|
+
|
|
26
|
+
Returns the 3 table rows the view then builds:
|
|
27
|
+
|
|
28
|
+
+------------------------+----------------------+--------------------------+
|
|
29
|
+
| Sub-template | Path | Using templates |
|
|
30
|
+
+========================+======================+==========================+
|
|
31
|
+
| Header | POD Templates | Collection template | rows[0]
|
|
32
|
+
| header, zeta_var | | Multiple format template |
|
|
33
|
+
+------------------------+----------------------+--------------------------+
|
|
34
|
+
| | POD Templates / Zeta | In Zeta template | rows[1]
|
|
35
|
+
+------------------------+----------------------+--------------------------+
|
|
36
|
+
| Zeta / In Zeta | - | not used | rows[2]
|
|
37
|
+
+------------------------+----------------------+--------------------------+
|
|
38
|
+
|
|
39
|
+
rows[1] is a continuation row: same sub-template, second path group, so its
|
|
40
|
+
first cell stays empty ('first' is False). rows[2] has 'group' set to None.
|
|
41
|
+
The two merge variables of 'Header' differ, which turns its cell red.
|
|
42
|
+
"""
|
|
43
|
+
pod = self.portal.podtemplates
|
|
44
|
+
folder = _createObjectByType("Folder", pod, "folder_z", title=u"Zeta")
|
|
45
|
+
api.content.create(type="SubTemplate", id="st_z", title=u"In Zeta", container=folder)
|
|
46
|
+
api.content.create(type="ConfigurablePODTemplate", id="in_zeta", title=u"In Zeta template",
|
|
47
|
+
container=folder,
|
|
48
|
+
merge_templates=[{"template": pod.sub_template.UID(),
|
|
49
|
+
"pod_context_name": u"zeta_var", "do_rendering": False}])
|
|
50
|
+
self.view.update()
|
|
51
|
+
return self.view.table.results
|
|
52
|
+
|
|
53
|
+
def test_sub_templates_usage(self):
|
|
54
|
+
entries = self.view.sub_templates_usage()
|
|
55
|
+
# one entry per sub-template (here the single demo 'sub_template')
|
|
56
|
+
self.assertEqual([e["sub_template"].getId for e in entries], ["sub_template"])
|
|
57
|
+
self.assertEqual(entries[0]["sub_template_uid"], self.portal.podtemplates.sub_template.UID())
|
|
58
|
+
# the only sub-template defines the whole common path -> empty rel_path
|
|
59
|
+
self.assertEqual(entries[0]["rel_path"], u"")
|
|
60
|
+
# both using templates share the same folder -> one group, sorted by title
|
|
61
|
+
groups = entries[0]["groups"]
|
|
62
|
+
self.assertEqual(len(groups), 1)
|
|
63
|
+
self.assertEqual([t.getId() for t in groups[0]["templates"]], ["test_template_bis", "test_template_multiple"])
|
|
64
|
+
|
|
65
|
+
def test_rel_path_strips_common_part(self):
|
|
66
|
+
# add two more sub-templates in distinct sub-folders of 'podtemplates'
|
|
67
|
+
pod = self.portal.podtemplates
|
|
68
|
+
# following escape disallowed !
|
|
69
|
+
folder_z = _createObjectByType("Folder", pod, "folder_z", title=u"Zeta")
|
|
70
|
+
folder_a = _createObjectByType("Folder", pod, "folder_a", title=u"Alpha")
|
|
71
|
+
api.content.create(type="SubTemplate", id="st_z", title=u"In Zeta", container=folder_z)
|
|
72
|
+
api.content.create(type="SubTemplate", id="st_a", title=u"In Alpha", container=folder_a)
|
|
73
|
+
|
|
74
|
+
entries = self.view.sub_templates_usage()
|
|
75
|
+
rel_paths = [e["rel_path"] for e in entries]
|
|
76
|
+
# 'podtemplates' is common to every sub-template and is stripped away;
|
|
77
|
+
# the demo sub-template sits directly in 'podtemplates' -> empty rel_path.
|
|
78
|
+
self.assertEqual(rel_paths, [u"", u"Alpha", u"Zeta"])
|
|
79
|
+
# entries are ordered by the first-column path (rel_path) then by title
|
|
80
|
+
self.assertEqual(
|
|
81
|
+
[e["sub_template"].getId for e in entries],
|
|
82
|
+
["sub_template", "st_a", "st_z"],
|
|
83
|
+
)
|
|
84
|
+
# the common 'podtemplates' segment never appears in the displayed path
|
|
85
|
+
pod_title = pod.Title()
|
|
86
|
+
self.assertFalse(any(pod_title in rel_path for rel_path in rel_paths))
|
|
87
|
+
|
|
88
|
+
def test_update(self):
|
|
89
|
+
rows = self._rows()
|
|
90
|
+
self.assertEqual([col.__name__ for col in self.view.table.columns],
|
|
91
|
+
["SubTemplateColumn", "SubTemplateUsagePathColumn", "SubTemplateUsageTemplatesColumn"])
|
|
92
|
+
# one row per (sub-template, path group), 'first' marking a group start
|
|
93
|
+
self.assertEqual([(r["sub_template"].getId, r["first"], r["group"] is None) for r in rows],
|
|
94
|
+
[("sub_template", True, False),
|
|
95
|
+
("sub_template", False, False),
|
|
96
|
+
("st_z", True, True)])
|
|
97
|
+
# the whole page renders the table
|
|
98
|
+
self.assertIn(u'class="listing nosort sub-templates-usage"', self.view())
|
|
99
|
+
|
|
100
|
+
def test_SubTemplateColumn(self):
|
|
101
|
+
rows = self._rows()
|
|
102
|
+
column = SubTemplateColumn(self.view.context, self.view.request, self.view.table)
|
|
103
|
+
# the merge variables of every using template, whatever their path group
|
|
104
|
+
self.assertEqual(column.renderCell(rows[0]),
|
|
105
|
+
u'<a href="http://nohost/plone/podtemplates/sub_template">Header</a>'
|
|
106
|
+
u'<div class="pod-context-name">header, zeta_var</div>')
|
|
107
|
+
# a continuation row leaves the cell empty, as the removed rowspan did
|
|
108
|
+
self.assertEqual(column.renderCell(rows[1]), u"")
|
|
109
|
+
# an unused sub-template has no path and no variable to show
|
|
110
|
+
self.assertEqual(column.renderCell(rows[2]),
|
|
111
|
+
u'<span>Zeta</span> / '
|
|
112
|
+
u'<a href="http://nohost/plone/podtemplates/folder_z/st_z">In Zeta</a>')
|
|
113
|
+
# a single variable name, shared by every using template, is displayed once
|
|
114
|
+
self.portal.podtemplates.folder_z.in_zeta.merge_templates[0]["pod_context_name"] = u"header"
|
|
115
|
+
self.view.update() # names are computed when the rows are built
|
|
116
|
+
self.assertIn(u'<div class="pod-context-name">header</div>',
|
|
117
|
+
column.renderCell(self.view.table.results[0]))
|
|
118
|
+
|
|
119
|
+
def test_get_pod_context_names(self):
|
|
120
|
+
rows = self._rows()
|
|
121
|
+
pod = self.portal.podtemplates
|
|
122
|
+
uid = pod.sub_template.UID()
|
|
123
|
+
self.assertEqual(get_pod_context_names(uid, rows[0]["groups"]), [u"header", u"zeta_var"])
|
|
124
|
+
# computed once per sub-template: every row of the sub-template carries them
|
|
125
|
+
self.assertEqual(rows[1]["pod_context_names"], [u"header", u"zeta_var"])
|
|
126
|
+
# nothing to collect for a sub-template used by no template
|
|
127
|
+
self.assertEqual(rows[2]["pod_context_names"], [])
|
|
128
|
+
self.assertEqual(get_pod_context_names(uid, None), [])
|
|
129
|
+
# templates not merging the sub-template, without the field at all or with an
|
|
130
|
+
# empty variable name are all skipped
|
|
131
|
+
self.assertEqual(get_pod_context_names(uid, [{"templates": [pod.test_template, pod.test_style_template]}]),
|
|
132
|
+
[])
|
|
133
|
+
pod.test_template_multiple.merge_templates[0]["pod_context_name"] = u""
|
|
134
|
+
self.assertEqual(get_pod_context_names(uid, [{"templates": [pod.test_template_multiple]}]), [])
|
|
135
|
+
|
|
136
|
+
def test_conflicting_variables_cell(self):
|
|
137
|
+
self._rows()
|
|
138
|
+
self.assertIn(u'class="sub-template-column conflicting-variables"', self.view())
|
|
139
|
+
# the same variable name everywhere: the cell keeps its plain class
|
|
140
|
+
self.portal.podtemplates.folder_z.in_zeta.merge_templates[0]["pod_context_name"] = u"header"
|
|
141
|
+
self.assertNotIn(u"conflicting-variables", self.view())
|
|
142
|
+
|
|
143
|
+
def test_SubTemplateUsagePathColumn(self):
|
|
144
|
+
rows = self._rows()
|
|
145
|
+
column = SubTemplateUsagePathColumn(self.view.context, self.view.request, self.view.table)
|
|
146
|
+
self.assertEqual(column.header, u"sub_template_usage_path")
|
|
147
|
+
self.assertEqual(column.renderCell(rows[0]), u"POD Templates")
|
|
148
|
+
self.assertEqual(column.renderCell(rows[1]), u"POD Templates / Zeta")
|
|
149
|
+
# an unused sub-template has no path to show
|
|
150
|
+
self.assertEqual(column.renderCell(rows[2]), u"-")
|
|
151
|
+
|
|
152
|
+
def test_SubTemplateUsageTemplatesColumn(self):
|
|
153
|
+
rows = self._rows()
|
|
154
|
+
column = SubTemplateUsageTemplatesColumn(self.view.context, self.view.request, self.view.table)
|
|
155
|
+
self.assertEqual(column.header, u"sub_template_usage_templates")
|
|
156
|
+
self.assertEqual(column.renderCell(rows[0]),
|
|
157
|
+
u'<ul><li><a href="http://nohost/plone/podtemplates/test_template_bis">'
|
|
158
|
+
u'Collection template</a></li>'
|
|
159
|
+
u'<li><a href="http://nohost/plone/podtemplates/test_template_multiple">'
|
|
160
|
+
u'Multiple format template</a></li></ul>')
|
|
161
|
+
self.assertEqual(column.renderCell(rows[1]),
|
|
162
|
+
u'<ul><li><a href="http://nohost/plone/podtemplates/folder_z/in_zeta">'
|
|
163
|
+
u'In Zeta template</a></li></ul>')
|
|
164
|
+
# the not-used row shows an emphasized label instead of links
|
|
165
|
+
self.assertRegexpMatches(column.renderCell(rows[2]), u"^<em>[^<]+</em>$")
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
# -*- coding: utf-8 -*-
|
|
2
|
+
|
|
3
|
+
from collective.documentgenerator.browser.table import get_sub_template_usage_rows
|
|
4
|
+
from collective.documentgenerator.testing import PODTemplateIntegrationTest
|
|
5
|
+
from collective.documentgenerator.viewlets.sub_template_usage import SubTemplateUsageViewlet
|
|
6
|
+
from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
class UsageViewlet(SubTemplateUsageViewlet):
|
|
10
|
+
"""The zcml registration binds the template, so bind it by hand to render the viewlet."""
|
|
11
|
+
|
|
12
|
+
index = ViewPageTemplateFile("../viewlets/sub_template_usage.pt")
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
class TestSubTemplateUsageViewlet(PODTemplateIntegrationTest):
|
|
16
|
+
"""Test the 'sub-template-usage' viewlet on a SubTemplate.
|
|
17
|
+
|
|
18
|
+
The demo profile creates a 'sub_template' used by 'test_template_multiple'
|
|
19
|
+
and 'test_template_bis', both in the 'podtemplates' folder.
|
|
20
|
+
"""
|
|
21
|
+
|
|
22
|
+
def setUp(self):
|
|
23
|
+
super(TestSubTemplateUsageViewlet, self).setUp()
|
|
24
|
+
portal = self.portal
|
|
25
|
+
sub_template = portal.podtemplates.sub_template
|
|
26
|
+
self.viewlet = UsageViewlet(sub_template, portal.REQUEST, None, None)
|
|
27
|
+
|
|
28
|
+
def test_available_and_using_templates_grouped_by_path(self):
|
|
29
|
+
self.assertTrue(self.viewlet.available())
|
|
30
|
+
groups = self.viewlet.get_using_templates_by_path()
|
|
31
|
+
# both templates live in the same folder -> a single group, sorted by title
|
|
32
|
+
self.assertEqual(len(groups), 1)
|
|
33
|
+
self.assertEqual([t.getId() for t in groups[0]['templates']],
|
|
34
|
+
['test_template_bis', 'test_template_multiple'])
|
|
35
|
+
|
|
36
|
+
def test_update(self):
|
|
37
|
+
self.viewlet.update()
|
|
38
|
+
# the sub-template is the context here, so its column and its merge variable are dropped
|
|
39
|
+
self.assertEqual([col.__name__ for col in self.viewlet.table.columns],
|
|
40
|
+
['SubTemplateUsagePathColumn', 'SubTemplateUsageTemplatesColumn'])
|
|
41
|
+
self.assertEqual(len(self.viewlet.table.results), 1)
|
|
42
|
+
|
|
43
|
+
def test_render(self):
|
|
44
|
+
self.viewlet.update()
|
|
45
|
+
rendered = self.viewlet.render()
|
|
46
|
+
self.assertEqual(rendered.count(u'<th>'), 2)
|
|
47
|
+
self.assertIn(u'<li><a href="http://nohost/plone/podtemplates/test_template_bis">'
|
|
48
|
+
u'Collection template</a></li>', rendered)
|
|
49
|
+
# the sub-template column is hidden, and with it the merge variable it carries
|
|
50
|
+
self.assertNotIn(u'sub-template-column', rendered)
|
|
51
|
+
self.assertNotIn(u'pod-context-name', rendered)
|
|
52
|
+
|
|
53
|
+
def test_get_sub_template_usage_rows(self):
|
|
54
|
+
entries = [{'sub_template': 'brain1', 'rel_path': u'A', 'sub_template_uid': 'uid1',
|
|
55
|
+
'groups': [{'title_path': u'p1', 'templates': []}, {'title_path': u'p2', 'templates': []}]},
|
|
56
|
+
{'sub_template': 'brain2', 'rel_path': u'', 'sub_template_uid': 'uid2',
|
|
57
|
+
'groups': []}]
|
|
58
|
+
rows = get_sub_template_usage_rows(entries)
|
|
59
|
+
|
|
60
|
+
# one row per group, 'first' only on the first one; a sub-template used by no
|
|
61
|
+
# template still gets a row, marked by a None group
|
|
62
|
+
self.assertEqual([(r['sub_template_uid'], r['first'], r['group']) for r in rows],
|
|
63
|
+
[('uid1', True, {'title_path': u'p1', 'templates': []}),
|
|
64
|
+
('uid1', False, {'title_path': u'p2', 'templates': []}),
|
|
65
|
+
('uid2', True, None)])
|
|
66
|
+
|
|
67
|
+
# the sub-template column data is carried on every row of the group
|
|
68
|
+
self.assertEqual([(r['sub_template'], r['rel_path']) for r in rows[:2]],
|
|
69
|
+
[('brain1', u'A'), ('brain1', u'A')])
|