collective.documentgenerator 3.47.1__tar.gz → 3.49__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.
Files changed (207) hide show
  1. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/CHANGES.rst +31 -0
  2. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/PKG-INFO +45 -1
  3. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/README.rst +13 -0
  4. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/setup.py +1 -1
  5. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/browser/children_pod_template.pt +3 -3
  6. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/browser/configure.zcml +9 -1
  7. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/browser/controlpanel.py +1 -1
  8. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/browser/generation_view.py +18 -4
  9. collective_documentgenerator-3.49/src/collective/documentgenerator/browser/sub_templates_usage.pt +62 -0
  10. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/browser/templates_listing.pt +3 -0
  11. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/browser/views.py +39 -2
  12. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/content/pod_template.py +15 -10
  13. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/locales/collective.documentgenerator.pot +140 -89
  14. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/locales/es/LC_MESSAGES/collective.documentgenerator.po +146 -90
  15. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/locales/es/LC_MESSAGES/plone.po +1 -1
  16. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/locales/fr/LC_MESSAGES/collective.documentgenerator.po +150 -94
  17. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/locales/fr/LC_MESSAGES/plone.po +1 -1
  18. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/locales/plone.pot +1 -1
  19. collective_documentgenerator-3.49/src/collective/documentgenerator/migrations/migrate_to_16.py +86 -0
  20. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/profiles/plone4/metadata.xml +1 -1
  21. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/profiles/plone5/metadata.xml +1 -1
  22. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/profiles.zcml +12 -2
  23. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/tests/test_base_helper_view.py +1 -1
  24. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/tests/test_configurable_pod_template.py +32 -1
  25. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/tests/test_generation_view.py +3 -3
  26. collective_documentgenerator-3.49/src/collective/documentgenerator/tests/test_sub_templates_usage_view.py +51 -0
  27. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/tests/test_utils.py +36 -0
  28. collective_documentgenerator-3.49/src/collective/documentgenerator/tests/test_viewlets.py +29 -0
  29. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/utils.py +80 -0
  30. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/viewlets/configure.zcml +9 -0
  31. collective_documentgenerator-3.49/src/collective/documentgenerator/viewlets/sub_template_usage.pt +32 -0
  32. collective_documentgenerator-3.49/src/collective/documentgenerator/viewlets/sub_template_usage.py +27 -0
  33. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective.documentgenerator.egg-info/PKG-INFO +45 -1
  34. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective.documentgenerator.egg-info/SOURCES.txt +7 -1
  35. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/.coveragerc +0 -0
  36. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/.isort.cfg +0 -0
  37. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/.tx/config +0 -0
  38. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/MANIFEST.in +0 -0
  39. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/Makefile +0 -0
  40. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/buildout.cfg +0 -0
  41. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/docs/LICENSE.GPL +0 -0
  42. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/docs/LICENSE.rst +0 -0
  43. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/docs/developer.rst +0 -0
  44. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/docs/images/AddPODTTemplateMenu.png +0 -0
  45. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/docs/images/addPloneSite.png +0 -0
  46. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/docs/images/demoInstal.png +0 -0
  47. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/docs/images/documentgenerator-searchreplacepanel.png +0 -0
  48. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/docs/images/viewlet.png +0 -0
  49. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/docs/search_replace.rst +0 -0
  50. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/docs/technical.rst +0 -0
  51. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/docs/user.rst +0 -0
  52. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/setup.cfg +0 -0
  53. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/__init__.py +0 -0
  54. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/AT_renderer.py +0 -0
  55. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/DX_renderer.py +0 -0
  56. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/__init__.py +0 -0
  57. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/adapters.py +0 -0
  58. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/browser/__init__.py +0 -0
  59. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/browser/actionspanel.py +0 -0
  60. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/browser/check_pod_templates.pt +0 -0
  61. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/browser/converter.py +0 -0
  62. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/browser/overrides.py +0 -0
  63. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/browser/resources/css/documentgenerator.css +0 -0
  64. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/browser/static/.gitkeep +0 -0
  65. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/browser/static/configurable.svg +0 -0
  66. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/browser/static/csv.svg +0 -0
  67. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/browser/static/doc.svg +0 -0
  68. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/browser/static/docx.svg +0 -0
  69. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/browser/static/download_icon.svg +0 -0
  70. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/browser/static/libreoffice-blanck.svg +0 -0
  71. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/browser/static/mailinglooptemplate.svg +0 -0
  72. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/browser/static/missing_use.svg +0 -0
  73. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/browser/static/nok.svg +0 -0
  74. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/browser/static/nok_use.svg +0 -0
  75. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/browser/static/nok_used.svg +0 -0
  76. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/browser/static/odp.svg +0 -0
  77. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/browser/static/ods.svg +0 -0
  78. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/browser/static/odt.svg +0 -0
  79. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/browser/static/ok.svg +0 -0
  80. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/browser/static/ok_use.svg +0 -0
  81. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/browser/static/ok_used.svg +0 -0
  82. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/browser/static/pdf.svg +0 -0
  83. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/browser/static/podtemplate.svg +0 -0
  84. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/browser/static/rtf.svg +0 -0
  85. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/browser/static/style.svg +0 -0
  86. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/browser/static/subtemplate.svg +0 -0
  87. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/browser/static/xls.svg +0 -0
  88. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/browser/static/xlsx.svg +0 -0
  89. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/browser/table.py +0 -0
  90. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/config.py +0 -0
  91. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/configure.zcml +0 -0
  92. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/content/__init__.py +0 -0
  93. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/content/condition.py +0 -0
  94. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/content/conditions.zcml +0 -0
  95. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/content/configure.zcml +0 -0
  96. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/content/document_factory.py +0 -0
  97. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/content/file_representation.py +0 -0
  98. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/content/file_representation.zcml +0 -0
  99. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/content/merge_templates.py +0 -0
  100. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/content/merge_templates.zcml +0 -0
  101. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/content/style_template.py +0 -0
  102. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/content/vocabulary.py +0 -0
  103. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/content/vocabulary.zcml +0 -0
  104. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/demo/__init__.py +0 -0
  105. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/demo/archetypes.zcml +0 -0
  106. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/demo/configure.zcml +0 -0
  107. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/demo/helper.py +0 -0
  108. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/events/__init__.py +0 -0
  109. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/events/configure.zcml +0 -0
  110. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/events/pod_templates_events.py +0 -0
  111. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/events/styles_events.py +0 -0
  112. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/helper/__init__.py +0 -0
  113. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/helper/archetypes-adapter.zcml +0 -0
  114. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/helper/archetypes-page.zcml +0 -0
  115. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/helper/archetypes.py +0 -0
  116. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/helper/base.py +0 -0
  117. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/helper/configure.zcml +0 -0
  118. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/helper/dexterity.py +0 -0
  119. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/interfaces.py +0 -0
  120. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/locales/manual.pot +0 -0
  121. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/locales/plone-manual.pot +0 -0
  122. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/locales/update.sh +0 -0
  123. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/migrations/__init__.py +0 -0
  124. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/migrations/migrate_to_11.py +0 -0
  125. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/migrations/migrate_to_12.py +0 -0
  126. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/migrations/migrate_to_13.py +0 -0
  127. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/migrations/migrate_to_3.py +0 -0
  128. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/migrations/migrate_to_5.py +0 -0
  129. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/migrations/migrate_to_6.py +0 -0
  130. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/migrations/migrate_to_7.py +0 -0
  131. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/migrations/migrate_to_8.py +0 -0
  132. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/migrations/migrate_to_9.py +0 -0
  133. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/profiles/base/browserlayer.xml +0 -0
  134. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/profiles/base/controlpanel.xml +0 -0
  135. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/profiles/base/metadata.xml +0 -0
  136. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/profiles/base/types/ConfigurablePODTemplate.xml +0 -0
  137. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/profiles/base/types/MailingLoopTemplate.xml +0 -0
  138. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/profiles/base/types/PODTemplate.xml +0 -0
  139. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/profiles/base/types/StyleTemplate.xml +0 -0
  140. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/profiles/base/types/SubTemplate.xml +0 -0
  141. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/profiles/base/types.xml +0 -0
  142. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/profiles/base/viewlets.xml +0 -0
  143. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/profiles/demo/browserlayer.xml +0 -0
  144. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/profiles/demo/collectivedocumentgenerator_demo_marker.txt +0 -0
  145. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/profiles/demo/import_steps.xml +0 -0
  146. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/profiles/demo/metadata.xml +0 -0
  147. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/profiles/demo/registry.xml +0 -0
  148. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/profiles/demo/templates/mailing.odt +0 -0
  149. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/profiles/demo/templates/modele_general.ods +0 -0
  150. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/profiles/demo/templates/modele_general.odt +0 -0
  151. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/profiles/demo/templates/mod/303/250le_collection.odt" +0 -0
  152. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/profiles/demo/templates/possibly_mailed_model.odt +0 -0
  153. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/profiles/demo/templates/styles.odt +0 -0
  154. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/profiles/demo/templates/styles_2.odt +0 -0
  155. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/profiles/demo/templates/sub_template.odt +0 -0
  156. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/profiles/demo/viewlets.xml +0 -0
  157. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/profiles/plone4/collectivedocumentgenerator_marker.txt +0 -0
  158. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/profiles/plone4/cssregistry.xml +0 -0
  159. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/profiles/plone4/registry.xml +0 -0
  160. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/profiles/plone5/registry.xml +0 -0
  161. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/profiles/testing/metadata.xml +0 -0
  162. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/profiles/testing/propertiestool.xml +0 -0
  163. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/profiles/testing/types/member.xml +0 -0
  164. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/profiles/testing/types.xml +0 -0
  165. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/renderer.zcml +0 -0
  166. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/search_replace/__init__.py +0 -0
  167. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/search_replace/configure.zcml +0 -0
  168. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/search_replace/pod_template.py +0 -0
  169. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/search_replace/search_result_form.pt +0 -0
  170. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/search_replace/searchreplace_panel.pt +0 -0
  171. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/search_replace/searchreplace_panel.py +0 -0
  172. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/setuphandlers.py +0 -0
  173. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/testing.py +0 -0
  174. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/testing.zcml +0 -0
  175. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/tests/__init__.py +0 -0
  176. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/tests/failing_template.odt +0 -0
  177. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/tests/robot/.gitkeep +0 -0
  178. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/tests/template_to_clean.odt +0 -0
  179. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/tests/template_without_style_page.odt +0 -0
  180. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/tests/test_AT_helper_view.py +0 -0
  181. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/tests/test_DX_helper_view.py +0 -0
  182. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/tests/test_check_podtemplates_view.py +0 -0
  183. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/tests/test_config.py +0 -0
  184. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/tests/test_demo_profile.py +0 -0
  185. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/tests/test_events.py +0 -0
  186. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/tests/test_file.odt +0 -0
  187. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/tests/test_mailing.odt +0 -0
  188. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/tests/test_mailing_loop_template.py +0 -0
  189. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/tests/test_pod_template.py +0 -0
  190. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/tests/test_robot.py +0 -0
  191. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/tests/test_search_replace.py +0 -0
  192. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/tests/test_setup.py +0 -0
  193. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/tests/test_style_template.py +0 -0
  194. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/tests/test_sub_template.py +0 -0
  195. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/tests/test_templates_listing_view.py +0 -0
  196. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/tests/test_vocabulary.py +0 -0
  197. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/viewlets/__init__.py +0 -0
  198. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/viewlets/batchactions.py +0 -0
  199. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/viewlets/generationlinks.pt +0 -0
  200. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective/documentgenerator/viewlets/generationlinks.py +0 -0
  201. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective.documentgenerator.egg-info/dependency_links.txt +0 -0
  202. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective.documentgenerator.egg-info/entry_points.txt +0 -0
  203. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective.documentgenerator.egg-info/namespace_packages.txt +0 -0
  204. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective.documentgenerator.egg-info/not-zip-safe +0 -0
  205. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective.documentgenerator.egg-info/requires.txt +0 -0
  206. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/src/collective.documentgenerator.egg-info/top_level.txt +0 -0
  207. {collective_documentgenerator-3.47.1 → collective_documentgenerator-3.49}/test-ci.cfg +0 -0
@@ -1,6 +1,37 @@
1
1
  Changelog
2
2
  =========
3
3
 
4
+ 3.49 (2026-07-31)
5
+ -----------------
6
+
7
+ - Improved POD context variables to handle Python structures (list, tuple, dict).
8
+ BREAKING CHANGE: A context variable `1` is given to the template as the
9
+ integer `1` and no longer as the string `'1'` (same for `1.5` giving a float and `None`
10
+ giving `None`). Surround such a value with double quotes (`"1"`) to keep it a string.
11
+ Invalid Python literal values (plain text, `2026-01-01`, ...) are still kept as a string.
12
+ (MOD-1077)
13
+ [chris-adam]
14
+
15
+
16
+ 3.48 (2026-06-10)
17
+ -----------------
18
+
19
+ - Added viewlet on SubTemplate to show its use in merge_templates field.
20
+ [sgeulette]
21
+ - Added `sub-templates-usage` view listing every sub-template usage.
22
+ [sgeulette]
23
+ - Use `Compromiser` evaluator.
24
+ [gbastien]
25
+ - Added migration to `16` that will make sure existing POD templates are safe.
26
+ [gbastien]
27
+ - Added parameter `prepend_pod_title=True` to `DocumentGenerationView._get_filename`
28
+ so it is especially possible to not preprend pod template title to generated
29
+ file filename.
30
+ [gbastien]
31
+ - Close tag `<label>` correctly in `children_pod_template.pt` or the full template
32
+ is rendered with fields in the `<label>` leading to every values being `bold`.
33
+ [gbastien]
34
+
4
35
  3.47.1 (2026-03-26)
5
36
  -------------------
6
37
 
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: collective.documentgenerator
3
- Version: 3.47.1
3
+ Version: 3.49
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
@@ -185,6 +185,19 @@ Documentation about the search and replace feature is here :
185
185
  `docs/search_replace.rst <https://github.com/collective/collective.documentgenerator/tree/master/docs/search_replace.rst>`_
186
186
 
187
187
 
188
+ **Security: Compromiser evaluator**
189
+ ------------------------------------
190
+
191
+ By default, document generation uses the ``Compromiser`` evaluator from `appy` to block dangerous Python expressions inside POD templates.
192
+ This prevents code injection through template expressions.
193
+
194
+ To disable the ``Compromiser``, set the environment variable:
195
+
196
+ DOCUMENTGENERATOR_USE_COMPROMISER=0
197
+
198
+ It is enabled by default.
199
+
200
+
188
201
  **Logging & Debugging**
189
202
  -----------------------
190
203
 
@@ -216,6 +229,37 @@ The project is licensed under the GPLv2.
216
229
  Changelog
217
230
  =========
218
231
 
232
+ 3.49 (2026-07-31)
233
+ -----------------
234
+
235
+ - Improved POD context variables to handle Python structures (list, tuple, dict).
236
+ BREAKING CHANGE: A context variable `1` is given to the template as the
237
+ integer `1` and no longer as the string `'1'` (same for `1.5` giving a float and `None`
238
+ giving `None`). Surround such a value with double quotes (`"1"`) to keep it a string.
239
+ Invalid Python literal values (plain text, `2026-01-01`, ...) are still kept as a string.
240
+ (MOD-1077)
241
+ [chris-adam]
242
+
243
+
244
+ 3.48 (2026-06-10)
245
+ -----------------
246
+
247
+ - Added viewlet on SubTemplate to show its use in merge_templates field.
248
+ [sgeulette]
249
+ - Added `sub-templates-usage` view listing every sub-template usage.
250
+ [sgeulette]
251
+ - Use `Compromiser` evaluator.
252
+ [gbastien]
253
+ - Added migration to `16` that will make sure existing POD templates are safe.
254
+ [gbastien]
255
+ - Added parameter `prepend_pod_title=True` to `DocumentGenerationView._get_filename`
256
+ so it is especially possible to not preprend pod template title to generated
257
+ file filename.
258
+ [gbastien]
259
+ - Close tag `<label>` correctly in `children_pod_template.pt` or the full template
260
+ is rendered with fields in the `<label>` leading to every values being `bold`.
261
+ [gbastien]
262
+
219
263
  3.47.1 (2026-03-26)
220
264
  -------------------
221
265
 
@@ -135,6 +135,19 @@ Documentation about the search and replace feature is here :
135
135
  `docs/search_replace.rst <https://github.com/collective/collective.documentgenerator/tree/master/docs/search_replace.rst>`_
136
136
 
137
137
 
138
+ **Security: Compromiser evaluator**
139
+ ------------------------------------
140
+
141
+ By default, document generation uses the ``Compromiser`` evaluator from `appy` to block dangerous Python expressions inside POD templates.
142
+ This prevents code injection through template expressions.
143
+
144
+ To disable the ``Compromiser``, set the environment variable:
145
+
146
+ DOCUMENTGENERATOR_USE_COMPROMISER=0
147
+
148
+ It is enabled by default.
149
+
150
+
138
151
  **Logging & Debugging**
139
152
  -----------------------
140
153
 
@@ -11,7 +11,7 @@ long_description = (
11
11
 
12
12
  setup(
13
13
  name='collective.documentgenerator',
14
- version='3.47.1',
14
+ version='3.49',
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
@@ -1,6 +1,6 @@
1
1
  <tal:defines define="children view/get_children">
2
- <label class="horizontal" i18n:domain="collective.documentgenerator"
3
- i18n:translate="Linked POD Template using this one"/>
2
+ <label i18n:domain="collective.documentgenerator"
3
+ i18n:translate="Linked POD Template using this one"></label>
4
4
  <ul tal:condition="children">
5
5
  <li tal:repeat="child children">
6
6
  <a href="#"
@@ -13,4 +13,4 @@
13
13
 
14
14
  <p class="discreet" tal:condition="not:children" i18n:domain="collective.documentgenerator" i18n:translate="None">None</p>
15
15
 
16
- </tal:defines>
16
+ </tal:defines>
@@ -45,7 +45,7 @@
45
45
  class="collective.documentgenerator.browser.converter.DocumentConvertView"
46
46
  permission="zope2.View"
47
47
  />
48
-
48
+
49
49
  <browser:page
50
50
  for="*"
51
51
  name="persistent-document-conversion"
@@ -93,6 +93,14 @@
93
93
  permission="zope2.View"
94
94
  />
95
95
 
96
+ <browser:page
97
+ for="*"
98
+ name="sub-templates-usage"
99
+ class=".views.SubTemplatesUsage"
100
+ template="sub_templates_usage.pt"
101
+ permission="zope2.View"
102
+ />
103
+
96
104
  <!-- configure actionspanel -->
97
105
  <configure zcml:condition="installed imio.actionspanel" package="imio.actionspanel">
98
106
 
@@ -101,7 +101,7 @@ class IDocumentGeneratorControlPanelSchema(Interface):
101
101
 
102
102
  force_default_page_style_for_mailing = schema.Bool(
103
103
  title=_(u'Apply a default page style on mailing POD templates'),
104
- description=_(u'If enabled, this will automatically apply the default page style on the firstparagraph'
104
+ description=_(u'If enabled, this will automatically apply the default page style on the first paragraph '
105
105
  u'of a POD template using the "mailing" attribute (if no page style was set).'),
106
106
  required=False,
107
107
  default=False
@@ -2,6 +2,7 @@
2
2
 
3
3
  from .. import _
4
4
  from AccessControl import Unauthorized
5
+ from appy.pod.evaluator import Compromiser
5
6
  from appy.pod.renderer import CsvOptions
6
7
  from appy.pod.renderer import Renderer
7
8
  from appy.pod.styles_manager import TableProperties
@@ -127,13 +128,21 @@ class DocumentGenerationView(BrowserView):
127
128
  filename = self._get_filename()
128
129
  return rendered, filename, gen_context
129
130
 
130
- def _get_filename(self):
131
- """ """
132
- # we limit filename to 120 characters
133
- first_part = u'{0} {1}'.format(self.pod_template.title, safe_unicode(self.context.Title()))
131
+ def _get_filename(self, prepend_pod_title=True):
132
+ """
133
+ Return generated file filename.
134
+
135
+ :param prepend_pod_title: will preprend the POD template title before
136
+ context title for the generated file filename
137
+ title then pod template title
138
+ """
139
+ first_part = safe_unicode(self.context.Title())
140
+ if prepend_pod_title:
141
+ first_part = u'{0} {1}'.format(self.pod_template.title, first_part)
134
142
  # replace unicode special characters with ascii equivalent value
135
143
  first_part = unicodedata.normalize('NFKD', first_part).encode('ascii', 'ignore')
136
144
  util = queryUtility(IFileNameNormalizer)
145
+ # we limit filename to 120 characters
137
146
  # remove '-' from first_part because it is handled by cropName that manages max_length
138
147
  # and it behaves weirdly if it encounters '-'
139
148
  # moreover avoid more than one blank space at a time
@@ -270,6 +279,10 @@ class DocumentGenerationView(BrowserView):
270
279
  if output_format == "csv":
271
280
  csvOptions = CsvOptions(fieldSeparator=pod_template.csv_field_delimiter,
272
281
  textDelimiter=pod_template.csv_string_delimiter)
282
+ evaluator = None
283
+ if os.getenv('DOCUMENTGENERATOR_USE_COMPROMISER', True):
284
+ evaluator = Compromiser()
285
+
273
286
  renderer = Renderer(
274
287
  StringIO(document_template.data),
275
288
  generation_context,
@@ -283,6 +296,7 @@ class DocumentGenerationView(BrowserView):
283
296
  html=True,
284
297
  optimalColumnWidths=optimalColumnWidths,
285
298
  distributeColumns=distributeColumns,
299
+ evaluator=evaluator,
286
300
  stylesMapping=stylesMapping,
287
301
  stream=config.get_use_stream(),
288
302
  csvOptions=csvOptions,
@@ -0,0 +1,62 @@
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
+ <table class="listing" tal:define="entries view/sub_templates_usage">
16
+ <thead>
17
+ <tr>
18
+ <th i18n:translate="sub_template_usage_sub_template">Sub-template</th>
19
+ <th i18n:translate="sub_template_usage_path">Path</th>
20
+ <th i18n:translate="sub_template_usage_templates">Using templates</th>
21
+ </tr>
22
+ </thead>
23
+ <tbody>
24
+ <tal:entry repeat="entry entries">
25
+ <tr tal:condition="not:entry/groups">
26
+ <td>
27
+ <tal:path condition="entry/rel_path">
28
+ <span tal:content="entry/rel_path">Folder / Sub folder</span> /
29
+ </tal:path>
30
+ <a tal:attributes="href entry/sub_template/getURL"
31
+ tal:content="entry/sub_template/Title">Sub-template</a>
32
+ </td>
33
+ <td colspan="2"><em i18n:translate="sub_template_usage_not_used">not used</em></td>
34
+ </tr>
35
+ <tr tal:repeat="group entry/groups">
36
+ <td tal:condition="repeat/group/start"
37
+ tal:attributes="rowspan python:len(entry['groups'])">
38
+ <tal:path condition="entry/rel_path">
39
+ <span tal:content="entry/rel_path">Folder / Sub folder</span> /
40
+ </tal:path>
41
+ <a tal:attributes="href entry/sub_template/getURL"
42
+ tal:content="entry/sub_template/Title">Sub-template</a>
43
+ </td>
44
+ <td tal:content="group/title_path">Folder / Sub folder</td>
45
+ <td>
46
+ <ul>
47
+ <li tal:repeat="template group/templates">
48
+ <a tal:attributes="href template/absolute_url"
49
+ tal:content="template/Title">Template title</a>
50
+ </li>
51
+ </ul>
52
+ </td>
53
+ </tr>
54
+ </tal:entry>
55
+ </tbody>
56
+ </table>
57
+ </div>
58
+
59
+ </metal:main>
60
+
61
+ </body>
62
+ </html>
@@ -10,6 +10,9 @@
10
10
  <metal:main fill-slot="content-core">
11
11
  <metal:content-core define-macro="content-core">
12
12
 
13
+ <a tal:condition="view/has_sub_templates" target="_blank" tal:attributes="href string:${context/absolute_url}/@@sub-templates-usage"
14
+ i18n:translate="sub_templates_usage_link">Sub-templates usage</a>
15
+
13
16
  <tal:block define="results view/table/values;" tal:condition="results">
14
17
  <div id="dg-batch"><tal:batch replace="structure view/table/renderBatch" /></div>
15
18
  <tal:listing replace="structure view/table/render" />
@@ -7,12 +7,17 @@ from collective.documentgenerator.content.pod_template import IPODTemplate
7
7
  from collective.documentgenerator.content.pod_template import MailingLoopTemplate
8
8
  from collective.documentgenerator.content.pod_template import SubTemplate
9
9
  from collective.documentgenerator.content.style_template import IStyleTemplate
10
+ from collective.documentgenerator.utils import common_prefix_length
11
+ from collective.documentgenerator.utils import get_path_segments
12
+ from collective.documentgenerator.utils import get_pod_templates_using
13
+ from collective.documentgenerator.utils import group_templates_by_path
10
14
  from collective.documentgenerator.utils import translate as _
11
15
  from OFS.interfaces import IOrderedContainer
12
16
  from plone import api
13
17
  from plone.app.uuid.utils import uuidToObject
14
18
  from plone.dexterity.browser.edit import DefaultEditForm
15
19
  from plone.dexterity.browser.view import DefaultView
20
+ from Products.CMFPlone.utils import safe_unicode
16
21
  from Products.Five import BrowserView
17
22
  from z3c.form.contentprovider import ContentProviders
18
23
  from z3c.form.interfaces import IFieldsAndContentProvidersForm
@@ -39,6 +44,10 @@ class TemplatesListing(BrowserView):
39
44
 
40
45
  def __init__(self, context, request):
41
46
  super(TemplatesListing, self).__init__(context, request)
47
+ self.catalog = api.portal.get_tool("portal_catalog")
48
+
49
+ def has_sub_templates(self):
50
+ return bool(self.catalog.unrestrictedSearchResults(portal_type="SubTemplate"))
42
51
 
43
52
  def query_dict(self):
44
53
  crit = {"object_provides": self.provides}
@@ -55,8 +64,7 @@ class TemplatesListing(BrowserView):
55
64
  def update(self):
56
65
  self.table = self.__table__(self.context, self.request)
57
66
  self.table.__name__ = u"dg-templates-listing"
58
- catalog = api.portal.get_tool("portal_catalog")
59
- brains = catalog.searchResults(**self.query_dict())
67
+ brains = self.catalog.searchResults(**self.query_dict())
60
68
  res = [
61
69
  (brain.getObject(), os.path.dirname(brain.getPath())) for brain in brains
62
70
  ]
@@ -94,6 +102,35 @@ class TemplatesListing(BrowserView):
94
102
  return self.index()
95
103
 
96
104
 
105
+ class SubTemplatesUsage(BrowserView):
106
+ """Overview listing, for each sub-template, the POD templates that use
107
+ it in their 'merge_templates' field, grouped by the path they live in."""
108
+
109
+ def sub_templates_usage(self):
110
+ """Return a list of {'sub_template': brain, 'rel_path': unicode, 'groups': [...]}
111
+ entries, one per sub-template (including unused ones), ordered by the
112
+ first-column path then by title. 'rel_path' is the breadcrumb path leading
113
+ to the sub-template, with the part common to every sub-template removed.
114
+ 'groups' is the per-path grouping produced for the dedicated viewlet."""
115
+ catalog = api.portal.get_tool("portal_catalog")
116
+ result = []
117
+ all_segments = []
118
+ for brain in catalog(portal_type="SubTemplate", sort_on="sortable_title"):
119
+ sub_template = brain.getObject()
120
+ segments = get_path_segments(aq_parent(aq_inner(sub_template)))
121
+ all_segments.append(segments)
122
+ templates = get_pod_templates_using(sub_template)
123
+ result.append({"sub_template": brain, "segments": segments,
124
+ "groups": group_templates_by_path(templates)})
125
+ common = common_prefix_length([[seg[0] for seg in segs] for segs in all_segments])
126
+ for entry in result:
127
+ tail = entry.pop("segments")[common:]
128
+ entry["rel_path"] = u" / ".join(title for _id, title in tail)
129
+ result.sort(key=lambda e: (e["rel_path"].lower(),
130
+ safe_unicode(e["sub_template"].Title).lower()))
131
+ return result
132
+
133
+
97
134
  class DisplayChildrenPodTemplateProvider(ContentProviderBase):
98
135
  template = ViewPageTemplateFile("children_pod_template.pt")
99
136
 
@@ -9,10 +9,10 @@ from collective.documentgenerator.content.style_template import StyleTemplate
9
9
  from collective.documentgenerator.interfaces import IPODTemplateCondition
10
10
  from collective.documentgenerator.interfaces import ITemplatesToMerge
11
11
  from collective.documentgenerator.utils import compute_md5
12
+ from imio.helpers import HAS_PLONE_5_AND_MORE
12
13
  from imio.helpers.content import add_to_annotation
13
14
  from imio.helpers.content import del_from_annotation
14
15
  from imio.helpers.content import get_from_annotation
15
- from imio.helpers import HAS_PLONE_5_AND_MORE
16
16
  from plone import api
17
17
  from plone.autoform import directives as form
18
18
  from plone.autoform.interfaces import IFormFieldProvider
@@ -36,6 +36,7 @@ from zope.interface import Invalid
36
36
  from zope.interface import invariant
37
37
  from zope.interface import provider
38
38
 
39
+ import ast
39
40
  import copy
40
41
  import logging
41
42
 
@@ -311,7 +312,10 @@ class IConfigurablePODTemplate(IPODTemplate):
311
312
  form.widget('context_variables', DataGridFieldFactory)
312
313
  context_variables = schema.List(
313
314
  title=_(u'Context variables.'),
314
- description=_("These context variables are added to the odt_file context."),
315
+ description=_("These context variables are added to the odt_file context. A value that is a valid "
316
+ "python literal (True, False, None, 1, [1, 2], (1, 2), {'a': 1}) is converted to it, "
317
+ "any other value is kept as a string. Surround a value with double quotes to keep it "
318
+ "as a string."),
315
319
  required=False,
316
320
  value_type=DictRow(
317
321
  schema=IContextVariablesRowSchema,
@@ -454,18 +458,19 @@ class ConfigurablePODTemplate(PODTemplate):
454
458
 
455
459
  def get_context_variables(self):
456
460
  """
457
- Returns context_variables as dict
461
+ Returns context_variables as dict.
462
+ A value that is a valid python literal (True, False, None, 1, 1.5, [1, 2], (1, 2), {'a': 1})
463
+ is converted to it, any other value is kept as a string.
464
+ Surrounding a value with double quotes keeps it as a string ("1" gives '1').
458
465
  """
459
466
  ret = {}
460
467
  for line in self.context_variables or []:
461
- # Simple boolean conversion actually implemented
462
- # May be improved with ZPublisher.Converters, managing boolean, int, date, string, text, ...
463
- # Those last values in a list box with string as default value
464
468
  val = line['value']
465
- if val == 'True':
466
- val = True
467
- elif val == 'False':
468
- val = False
469
+ if val:
470
+ try:
471
+ val = ast.literal_eval(val)
472
+ except (SyntaxError, TypeError, ValueError):
473
+ pass # not a python literal, keep the original string
469
474
  ret[line['name']] = val
470
475
  return ret
471
476