review

collective · Apr 10, 2018 · 550ff74 · 550ff74
1 parent 9fc4315
commit 550ff74
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/src/collective/documentgenerator/browser/controlpanel.py b/src/collective/documentgenerator/browser/controlpanel.py
@@ -55,7 +55,7 @@ class IDocumentGeneratorControlPanelSchema(Interface):
         description=_(u'If enabled: this will allow the "table-layout: fixed|auto|none" CSS style handling while generating document. '
                       u'If no such style is define on the table, the chosen column modifier of LibreOffice will be applied.'),
         vocabulary='collective.documentgenerator.ConfigOptimizeTables',
-        required=False,
+        required=True,
         default='nothing'
     )
 
@@ -66,8 +66,8 @@ class IDocumentGeneratorControlPanelSchema(Interface):
                       u'be raised.  Nevertheless to ease debugging, Managers '
                       u'will continue to get errors in the generated document '
                       u'if it uses .odt format.'),
-        required=True,
-        default=None
+        required=False,
+        default=False
     )
 
 

diff --git a/src/collective/documentgenerator/content/vocabulary.py b/src/collective/documentgenerator/content/vocabulary.py
@@ -103,10 +103,7 @@ class PodOptimizeTablesVocabularyFactory(object):
 
     def __call__(self, context):
         # adapt first term value depending on global configuration value
-        global_value = _('Global value (nothing)')
-        config_value = get_column_modifier()
-        if config_value:
-            global_value = _('Global value (%s)' % config_value)
+        global_value = _('Global value (%s)' % get_column_modifier())
 
         voc_terms = [
             SimpleTerm(-1, -1, global_value),