pyams/pyams_form: comparison src/pyams

equal deleted inserted replaced

-:d83e8f9a9885
+:5a6990958cb3
 # FOR A PARTICULAR PURPOSE.
 #
 __docformat__ = 'restructuredtext'
-# import standard library
-import json
 import logging
 logger = logging.getLogger('PyAMS (form)')
+import json
 import transaction
 import venusian
+from persistent import IPersistent
-# 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 pyams_utils.interfaces import FORBIDDEN_PERMISSION, ICacheKeyValue
-from pyramid_chameleon.interfaces import IChameleonTranslate
-from z3c.form.interfaces import DISPLAY_MODE, IErrorViewSnippet, IMultipleErrors
-from zope.publisher.interfaces.browser import IBrowserRequest
-from zope.schema.interfaces import ValidationError
-# import packages
-from pyams_form.group import GroupsBasedForm
-from pyams_pagelet.interfaces import PageletCreatedEvent
-from pyams_skin.skin import apply_skin
-from pyams_utils.adapter import adapter_config, ContextRequestViewAdapter
-from pyams_utils.url import absolute_url
 from pyramid.decorator import reify
 from pyramid.events import subscriber
 from pyramid.response import Response
-from pyramid_zope_request import PyramidToPublisher, PyramidPublisherRequest
+from pyramid_chameleon.interfaces import IChameleonTranslate
+from pyramid_zope_request import PyramidPublisherRequest, PyramidToPublisher
 from z3c.form.button import Buttons
-from z3c.form.form import applyChanges, \
+from z3c.form.form import AddForm as BaseAddForm, DisplayForm as BaseDisplayForm, EditForm as BaseEditForm, Form, \
-Form, AddForm as BaseAddForm, EditForm as BaseEditForm, DisplayForm as BaseDisplayForm
+applyChanges
+from z3c.form.interfaces import DISPLAY_MODE, IErrorViewSnippet, IMultipleErrors
 from zope.component import queryUtility
-from zope.interface import implementer, classImplements, alsoProvides, Interface
+from zope.interface import Interface, alsoProvides, classImplements, implementer
 from zope.lifecycleevent import Attributes, ObjectCreatedEvent
 from zope.location import locate
+from zope.publisher.interfaces.browser import IBrowserRequest
 from zope.schema.fieldproperty import FieldProperty
+from zope.schema.interfaces import ValidationError
+from pyams_form.group import GroupsBasedForm
+from pyams_form.interfaces import get_form_weight
+from pyams_form.interfaces.form import FormCreatedEvent, IAJAXForm, ICustomUpdateSubForm, IForm, \
+IFormContextPermissionChecker, IFormCreatedEvent, IFormLayer, IInnerForm, IInnerSubForm, IInnerTabForm
+from pyams_form.interfaces.form import FormObjectCreatedEvent, FormObjectModifiedEvent
+from pyams_form.interfaces.form import IAddFormButtons, IEditFormButtons, IModalAddFormButtons, \
+IModalDisplayFormButtons, IModalEditFormButtons
+from pyams_i18n.interfaces import II18n
+from pyams_pagelet.interfaces import PageletCreatedEvent
+from pyams_skin.interfaces import IContentTitle, IDialog, ISkinnable
+from pyams_skin.skin import apply_skin
+from pyams_template.interfaces import IContentTemplate, ILayoutTemplate
+from pyams_utils.adapter import ContextRequestViewAdapter, adapter_config
+from pyams_utils.interfaces import FORBIDDEN_PERMISSION, ICacheKeyValue
+from pyams_utils.url import absolute_url
 from pyams_form import _
 REDIRECT_STATUS_CODES = (300, 301, 302, 303, 304, 305, 307)
 def createAndAdd(self, data):
 registry = self.request.registry
 # create object
 object = self.create(data.get(self, data))
-if object is not None:
+if IPersistent.providedBy(object):
 registry.notify(ObjectCreatedEvent(object))
 # set parent temporarily to avoid NotYet exceptions
 locate(object, self.context)
 # update object properties before adding it
 self.update_content(object, data)
 pass
 if 'implementer' in settings:
 implementer = settings.pop('implementer')
 if not isinstance(implementer, (list, tuple, set)):
-implementer = (implementer, )
+implementer = (implementer,)
 classImplements(new_class, *implementer)
 logger.debug('Registering AJAX view "{0}" for {1} ({2})'.format(settings.get('name'),
 str(settings.get('context', Interface)),
 str(new_class)))

changeset 142	5a6990958cb3
parent 118	0d462137f10d
child 149	d26223a00c51