Rewrite upgrades bobtemplates.plone style to get a better overview.

news/222.bugfix

@@ -0,0 +1 @@
+Fix deprecated ``fieldset`` import in interfaces.

news/223.bugfix

@@ -0,0 +1 @@
+Rewrite upgrades bobtemplates.plone style to get a better overview.

src/collective/easyform/configure.zcml

@@ -16,9 +16,9 @@
   <include file="subscribers.zcml" />
   <include file="validators.zcml" />
   <include file="vocabularies.zcml" />
-  <include file="upgrades.zcml" />
 
   <include package=".browser" />
+  <include package=".upgrades" />
   <include zcml:condition="installed Products.PloneFormGen" package=".migration" /> 
 
   <genericsetup:registerProfile

src/collective/easyform/interfaces/actions.py

@@ -7,7 +7,7 @@
 from plone.schemaeditor.interfaces import IFieldContext
 from plone.schemaeditor.interfaces import IFieldEditorExtender
 from plone.schemaeditor.interfaces import ISchemaContext
-from plone.supermodel.model import fieldset
+from plone.supermodel.directives import fieldset
 from plone.supermodel.model import Schema
 from zope.interface import Interface
 

src/collective/easyform/interfaces/easyform.py

@@ -5,7 +5,7 @@
 from plone import api
 from plone.app.textfield import RichText
 from plone.autoform import directives
-from plone.supermodel.model import fieldset
+from plone.supermodel.directives import fieldset
 from plone.supermodel.model import Schema
 from Products.CMFPlone.utils import safe_unicode
 from zope.i18n import translate

src/collective/easyform/interfaces/fields.py

@@ -7,7 +7,7 @@
 from plone.schemaeditor.interfaces import IFieldContext
 from plone.schemaeditor.interfaces import IFieldEditorExtender
 from plone.schemaeditor.interfaces import ISchemaContext
-from plone.supermodel.model import fieldset
+from plone.supermodel.directives import fieldset
 from plone.supermodel.model import Schema
 from z3c.form.interfaces import IFieldWidget
 from zope.component import getGlobalSiteManager

src/collective/easyform/interfaces/mailer.py

@@ -7,7 +7,7 @@
 from plone.app.textfield import RichText
 from plone.autoform import directives
 from plone.schema import Email
-from plone.supermodel.model import fieldset
+from plone.supermodel.directives import fieldset
 from Products.CMFPlone.utils import safe_unicode
 from z3c.form.browser.checkbox import CheckBoxFieldWidget
 from z3c.form.browser.textarea import TextAreaWidget

src/collective/easyform/upgrades/1001.zcml

@@ -0,0 +1,20 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:gs="http://namespaces.zope.org/genericsetup"
+    >
+
+  <gs:upgradeSteps
+      destination="1001"
+      profile="collective.easyform:default"
+      source="1000"
+      >
+    <gs:upgradeDepends
+        title="Reload profile to register new vocabulary name"
+        description=""
+        import_profile="collective.easyform:default"
+        import_steps="plone.app.registry"
+        run_deps="false"
+        />
+  </gs:upgradeSteps>
+
+</configure>

src/collective/easyform/upgrades/1002.zcml

@@ -0,0 +1,20 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:gs="http://namespaces.zope.org/genericsetup"
+    >
+
+  <gs:upgradeSteps
+      destination="1002"
+      profile="collective.easyform:default"
+      source="1001"
+      >
+    <gs:upgradeDepends
+        title="Remove ProtectedEmail and ProtectedTextLine as addable fields"
+        description="https://github.com/collective/collective.easyform/issues/94"
+        import_profile="collective.easyform:default"
+        import_steps="plone.app.registry"
+        run_deps="false"
+        />
+  </gs:upgradeSteps>
+
+</configure>

src/collective/easyform/upgrades/1003.zcml

@@ -0,0 +1,19 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:gs="http://namespaces.zope.org/genericsetup"
+    >
+
+  <gs:upgradeSteps
+      destination="1003"
+      profile="collective.easyform:default"
+      source="1002"
+      >
+    <gs:upgradeDepends
+        title="Add Browserlayer"
+        import_profile="collective.easyform:default"
+        import_steps="browserlayer"
+        run_deps="false"
+        />
+  </gs:upgradeSteps>
+
+</configure>

src/collective/easyform/upgrades/1004.zcml

@@ -0,0 +1,19 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:gs="http://namespaces.zope.org/genericsetup"
+    >
+
+  <gs:upgradeSteps
+      destination="1004"
+      profile="collective.easyform:default"
+      source="1003"
+      >
+    <gs:upgradeDepends
+        title="Changed permission of saveddata action"
+        import_profile="collective.easyform:default"
+        import_steps="actions"
+        run_deps="false"
+        />
+  </gs:upgradeSteps>
+
+</configure>

src/collective/easyform/upgrades/1005.zcml

@@ -0,0 +1,20 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:gs="http://namespaces.zope.org/genericsetup"
+    >
+
+  <gs:upgradeSteps
+      destination="1005"
+      profile="collective.easyform:default"
+      source="1004"
+      >
+    <gs:upgradeDepends
+        title="Reload profile to register bundle"
+        description=""
+        import_profile="collective.easyform:default"
+        import_steps="plone.app.registry"
+        run_deps="false"
+        />
+  </gs:upgradeSteps>
+
+</configure>

src/collective/easyform/upgrades/configure.zcml

@@ -0,0 +1,7 @@
+<configure xmlns="http://namespaces.zope.org/zope">
+  <include file="1001.zcml" />
+  <include file="1002.zcml" />
+  <include file="1003.zcml" />
+  <include file="1004.zcml" />
+  <include file="1005.zcml" />
+</configure>