check for self.widgets

plone · Aug 9, 2022 · 25d4fda · 25d4fda
1 parent 5411583
commit 25d4fda
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/plone/schemaeditor/browser/schema/add_field.py b/plone/schemaeditor/browser/schema/add_field.py
@@ -70,12 +70,15 @@ def create(self, data):
 
     def add(self, new_field):
         schema = self.context.schema
-
-        fieldset_widget = self.widgets.get('fieldset_id')
-        fieldset_id = 0
-        if fieldset_widget:
-            fieldset_id = int(fieldset_widget.extract())
-        position = new_field_position(schema, fieldset_id, new_field=True)
+        fieldset_id = int(self.request.form.get('fieldset_id', 0))
+
+        if self.widgets:
+            fieldset_widget = self.widgets.get('fieldset_id')
+            if fieldset_widget:
+                fieldset_id = int(fieldset_widget.extract())
+            position = new_field_position(schema, fieldset_id, new_field=True)
+        else:
+            position = new_field_position(schema, fieldset_id)
 
         editable_schema = IEditableSchema(schema)
         try: