Merge 1eef28b into 4db996e

collective · Jul 12, 2018 · 6cb1f9e · 6cb1f9e
2 parents 4db996e + 1eef28b
commit 6cb1f9e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -5,6 +5,9 @@ Changes
 1.5.0 (unreleased)
 ------------------
 
+- fix controlpanel to show settings navigation
+  [petschki]
+
 - memoize vocabulary lookup
   [tomgross, petschki]
 

diff --git a/src/collective/taxonomy/controlpanel.py b/src/collective/taxonomy/controlpanel.py
@@ -27,7 +27,7 @@
 logger = logging.getLogger("taxonomy.controlpanel")
 
 
-class TaxonomySettingsControlPanel(controlpanel.RegistryEditForm):
+class TaxonomySettingsControlPanelForm(controlpanel.RegistryEditForm):
     """ A controlpanel for managing taxonomies
 
     """
@@ -39,7 +39,7 @@ class TaxonomySettingsControlPanel(controlpanel.RegistryEditForm):
     description = _("Taxonomy settings")
 
     def updateFields(self):
-        super(TaxonomySettingsControlPanel, self).updateFields()
+        super(TaxonomySettingsControlPanelForm, self).updateFields()
         self.fields['taxonomies'].widgetFactory = CheckBoxFieldWidget
 
     def updateActions(self):
@@ -121,6 +121,10 @@ def handle_export_action(self, action):
             self.render = lambda: result
 
 
+class TaxonomySettingsControlPanel(controlpanel.ControlPanelFormWrapper):
+    form = TaxonomySettingsControlPanelForm
+
+
 class TaxonomyAddForm(form.AddForm):
 
     fields = field.Fields(ITaxonomyForm)