pyams/pyams_form: comparison src/pyams

equal deleted inserted replaced

-:ee1e85bd3580
+:e421b7c4281a
 # import interfaces
 from pyams_form.interfaces.form import IFormLayer, IForm, IAJAXForm, IInnerSubForm, IInnerTabForm, \
 ICustomUpdateSubForm, IFormCreatedEvent, FormCreatedEvent, IInnerForm, IFormContextPermissionChecker
 from pyams_form.interfaces.form import IAddFormButtons, IModalAddFormButtons, IEditFormButtons, \
 IModalEditFormButtons, IModalDisplayFormButtons
+from pyams_form.interfaces import get_form_weight
 from pyams_form.interfaces.form import FormObjectCreatedEvent, FormObjectModifiedEvent
 from pyams_i18n.interfaces import II18n
 from pyams_skin.interfaces import IDialog, ISkinnable, IContentTitle
 from pyams_template.interfaces import IContentTemplate, ILayoutTemplate
 from pyramid_chameleon.interfaces import IChameleonTranslate
 from zope.lifecycleevent import Attributes, ObjectCreatedEvent
 from zope.location import locate
 from zope.schema.fieldproperty import FieldProperty
 from pyams_form import _
-def get_form_weight(form):
-"""Try to get form weight attribute"""
-try:
-return form.weight
-except AttributeError:
-return 0
 REDIRECT_STATUS_CODES = (300, 301, 302, 303, 304, 305, 307)
 result.extend(form.widgets.errors)
 return result
 def update_content(self, content, data):
 changes = applyChanges(self, content, data)
-for subform in self.subforms + self.tabforms:
+subforms = self.subforms + self.tabforms
-if ICustomUpdateSubForm.providedBy(subform):
+[subforms.extend(group.subforms) for group in self.groups]
-updates = ICustomUpdateSubForm(subform).update_content(content, data)
+for subform in subforms:
+subform_update = ICustomUpdateSubForm(subform, None)
+if subform_update is not None:
+updates = subform_update.update_content(content, data)
 if isinstance(updates, dict):
 changes.update(updates)
 else:
 changes.update(applyChanges(subform, content, data))
 return changes
 @implementer(IInnerForm)
 class InnerAddForm(AddForm):
 """Inner add form"""
+css_class = 'inner'
 @property
 def id(self):
 return self.__class__.__name__
 buttons = Buttons(Interface)
 @implementer(IInnerForm)
 class InnerEditForm(EditForm):
 """Inner edit form"""
+css_class = 'inner'
 @property
 def id(self):
 return self.__class__.__name__
 buttons = Buttons(Interface)
 @implementer(IInnerForm)
 class InnerDisplayForm(DisplayForm):
 """Inner display form"""
+css_class = 'inner'
 @property
 def id(self):
 return self.__class__.__name__

changeset 20	e421b7c4281a
parent 16	2f2596eee744
child 28	893e485046bc