[fc] Repository: plone.app.upgrade

Branch: refs/heads/master Date: 2015-08-05T01:12:13+02:00 Author: Eric BREHAULT (ebrehault) <ebrehault@gmail.com> Commit: plone/plone.app.upgrade@35954bb Turn @@tinymce-controlpanel content_css field into a list Files changed: A plone/app/upgrade/v50/profiles/to_beta4/registry.xml M CHANGES.rst M plone/app/upgrade/v50/betas.py M plone/app/upgrade/v50/configure.zcml M plone/app/upgrade/v50/profiles.zcml Repository: plone.app.upgrade Branch: refs/heads/master Date: 2015-08-05T07:46:05+02:00 Author: Eric BREHAULT (ebrehault) <ebrehault@gmail.com> Commit: plone/plone.app.upgrade@206595e Merge pull request #41 from plone/ebr-tiny-css-content-list Turn @@tinymce-controlpanel content_css field into a list Files changed: A plone/app/upgrade/v50/profiles/to_beta4/registry.xml M CHANGES.rst M plone/app/upgrade/v50/betas.py M plone/app/upgrade/v50/configure.zcml M plone/app/upgrade/v50/profiles.zcml
plone · Aug 5, 2015 · 1893679 · 1893679
1 parent 7006f79
commit 1893679
Showing 1 changed file with 173 additions and 62 deletions.
diff --git a/last_commit.txt b/last_commit.txt
@@ -1,97 +1,208 @@
-Repository: Products.PortalTransforms
+Repository: plone.app.upgrade
 
 
 Branch: refs/heads/master
-Date: 2015-08-04T13:32:39-05:00
-Author: vangheem (vangheem) <vangheem@gmail.com>
-Commit: https://github.com/plone/Products.PortalTransforms/commit/95611534c94d24c0e5b2ee02b414b746ef21fbcd
+Date: 2015-08-05T01:12:13+02:00
+Author: Eric BREHAULT (ebrehault) <ebrehault@gmail.com>
+Commit: https://github.com/plone/plone.app.upgrade/commit/35954bb747bcbc786b12c51ce0e1e5e050732ff8
 
-fix error mis-configured transforms would cause:
-  "AttributeError: 'NoneType' object has no attribute 'items'"
+Turn @@tinymce-controlpanel content_css field into a list
 
 Files changed:
+A plone/app/upgrade/v50/profiles/to_beta4/registry.xml
 M CHANGES.rst
-M Products/PortalTransforms/Transform.py
+M plone/app/upgrade/v50/betas.py
+M plone/app/upgrade/v50/configure.zcml
+M plone/app/upgrade/v50/profiles.zcml
 
 diff --git a/CHANGES.rst b/CHANGES.rst
-index d65fbc1..3edda02 100644
+index d5325c9..452129f 100644
 --- a/CHANGES.rst
 +++ b/CHANGES.rst
-@@ -4,7 +4,9 @@ Changelog
- 2.1.8 (unreleased)
- ------------------
+@@ -4,7 +4,8 @@ Changelog
+ 1.3.13 (unreleased)
+ -------------------
 
 -- Nothing changed yet.
-+- fix error mis-configured transforms would cause:
-+  "AttributeError: 'NoneType' object has no attribute 'items'"
-+  [vangheem]
++- Turn @@tinymce-controlpanel ``content_css`` field into a list
++  [ebrehault]
 
 
- 2.1.7 (2015-06-24)
-diff --git a/Products/PortalTransforms/Transform.py b/Products/PortalTransforms/Transform.py
-index fb9e831..40cc325 100644
---- a/Products/PortalTransforms/Transform.py
-+++ b/Products/PortalTransforms/Transform.py
-@@ -218,8 +218,9 @@ def get_parameter_value(self, key):
-         type = self.get_parameter_infos(key)[0]
-         if type == 'dict':
-             result = {}
--            for key, val in value.items():
--                result[key] = val
-+            if value:
-+                for key, val in value.items():
-+                    result[key] = val
-         elif type == 'list':
-             result = list(value)
-         else:
+ 1.3.12 (2015-07-23)
+diff --git a/plone/app/upgrade/v50/betas.py b/plone/app/upgrade/v50/betas.py
+index ea35560..1bbf12a 100644
+--- a/plone/app/upgrade/v50/betas.py
++++ b/plone/app/upgrade/v50/betas.py
+@@ -259,3 +259,8 @@ def to50beta3(context):
+     ][0]
+     configlet.title = "Content Settings"
+     configlet.url_expr = "string:${portal_url}/@@content-controlpanel"
++
++
++def to50beta4(context):
++    """5.0beta3 -> 5.0beta4"""
++    loadMigrationProfile(context, 'profile-plone.app.upgrade.v50:to50beta4')
+diff --git a/plone/app/upgrade/v50/configure.zcml b/plone/app/upgrade/v50/configure.zcml
+index a6ad68e..17252bf 100644
+--- a/plone/app/upgrade/v50/configure.zcml
++++ b/plone/app/upgrade/v50/configure.zcml
+@@ -142,5 +142,17 @@
+            />
+
+     </gs:upgradeSteps>
++    <gs:upgradeSteps
++        source="5006"
++        destination="5007"
++        profile="Products.CMFPlone:plone">
++
++       <gs:upgradeStep
++           title="Run to50beta4 upgrade profile"
++           description=""
++           handler=".betas.to50beta4"
++           />
++
++    </gs:upgradeSteps>
+
+ </configure>
+diff --git a/plone/app/upgrade/v50/profiles.zcml b/plone/app/upgrade/v50/profiles.zcml
+index 7c00e9c..0fd0372 100644
+--- a/plone/app/upgrade/v50/profiles.zcml
++++ b/plone/app/upgrade/v50/profiles.zcml
+@@ -47,4 +47,13 @@
+       for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"
+       provides="Products.GenericSetup.interfaces.EXTENSION"
+       />
++
++  <genericsetup:registerProfile
++      name="to50beta4"
++      title="Upgrade profile for Plone 5006 to Plone 5.0b4"
++      description=""
++      directory="profiles/to_beta4"
++      for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"
++      provides="Products.GenericSetup.interfaces.EXTENSION"
++      />
+ </configure>
+diff --git a/plone/app/upgrade/v50/profiles/to_beta4/registry.xml b/plone/app/upgrade/v50/profiles/to_beta4/registry.xml
+new file mode 100644
+index 0000000..796dadf
+--- /dev/null
++++ b/plone/app/upgrade/v50/profiles/to_beta4/registry.xml
+@@ -0,0 +1,10 @@
++<?xml version="1.0"?>
++<registry>
++  <records interface="Products.CMFPlone.interfaces.ITinyMCESchema"
++           prefix="plone">
++    <value key="content_css">
++      <element>++plone++static/components/tinymce-builded/js/tinymce/skins/lightgray/content.min.css</element>
++    </value>
++  </records>
++
++</registry>
+\ No newline at end of file
 
 
-Repository: Products.PortalTransforms
+Repository: plone.app.upgrade
 
 
 Branch: refs/heads/master
-Date: 2015-08-04T14:59:18-05:00
-Author: Nathan Van Gheem (vangheem) <vangheem@gmail.com>
-Commit: https://github.com/plone/Products.PortalTransforms/commit/810f6fd37354bd82d114d07ea49252efde9e5edc
+Date: 2015-08-05T07:46:05+02:00
+Author: Eric BREHAULT (ebrehault) <ebrehault@gmail.com>
+Commit: https://github.com/plone/plone.app.upgrade/commit/206595e7650bd91bf08d6741b32313f3cb02329e
 
-Merge pull request #9 from plone/mis-configured-transforms-error
+Merge pull request #41 from plone/ebr-tiny-css-content-list
 
-fix error mis-configured transforms would cause
+Turn @@tinymce-controlpanel content_css field into a list
 
 Files changed:
+A plone/app/upgrade/v50/profiles/to_beta4/registry.xml
 M CHANGES.rst
-M Products/PortalTransforms/Transform.py
+M plone/app/upgrade/v50/betas.py
+M plone/app/upgrade/v50/configure.zcml
+M plone/app/upgrade/v50/profiles.zcml
 
 diff --git a/CHANGES.rst b/CHANGES.rst
-index d65fbc1..3edda02 100644
+index d5325c9..452129f 100644
 --- a/CHANGES.rst
 +++ b/CHANGES.rst
-@@ -4,7 +4,9 @@ Changelog
- 2.1.8 (unreleased)
- ------------------
+@@ -4,7 +4,8 @@ Changelog
+ 1.3.13 (unreleased)
+ -------------------
 
 -- Nothing changed yet.
-+- fix error mis-configured transforms would cause:
-+  "AttributeError: 'NoneType' object has no attribute 'items'"
-+  [vangheem]
++- Turn @@tinymce-controlpanel ``content_css`` field into a list
++  [ebrehault]
+
+
+ 1.3.12 (2015-07-23)
+diff --git a/plone/app/upgrade/v50/betas.py b/plone/app/upgrade/v50/betas.py
+index ea35560..1bbf12a 100644
+--- a/plone/app/upgrade/v50/betas.py
++++ b/plone/app/upgrade/v50/betas.py
+@@ -259,3 +259,8 @@ def to50beta3(context):
+     ][0]
+     configlet.title = "Content Settings"
+     configlet.url_expr = "string:${portal_url}/@@content-controlpanel"
++
++
++def to50beta4(context):
++    """5.0beta3 -> 5.0beta4"""
++    loadMigrationProfile(context, 'profile-plone.app.upgrade.v50:to50beta4')
+diff --git a/plone/app/upgrade/v50/configure.zcml b/plone/app/upgrade/v50/configure.zcml
+index a6ad68e..17252bf 100644
+--- a/plone/app/upgrade/v50/configure.zcml
++++ b/plone/app/upgrade/v50/configure.zcml
+@@ -142,5 +142,17 @@
+            />
 
+     </gs:upgradeSteps>
++    <gs:upgradeSteps
++        source="5006"
++        destination="5007"
++        profile="Products.CMFPlone:plone">
++
++       <gs:upgradeStep
++           title="Run to50beta4 upgrade profile"
++           description=""
++           handler=".betas.to50beta4"
++           />
++
++    </gs:upgradeSteps>
 
- 2.1.7 (2015-06-24)
-diff --git a/Products/PortalTransforms/Transform.py b/Products/PortalTransforms/Transform.py
-index fb9e831..40cc325 100644
---- a/Products/PortalTransforms/Transform.py
-+++ b/Products/PortalTransforms/Transform.py
-@@ -218,8 +218,9 @@ def get_parameter_value(self, key):
-         type = self.get_parameter_infos(key)[0]
-         if type == 'dict':
-             result = {}
--            for key, val in value.items():
--                result[key] = val
-+            if value:
-+                for key, val in value.items():
-+                    result[key] = val
-         elif type == 'list':
-             result = list(value)
-         else:
+ </configure>
+diff --git a/plone/app/upgrade/v50/profiles.zcml b/plone/app/upgrade/v50/profiles.zcml
+index 7c00e9c..0fd0372 100644
+--- a/plone/app/upgrade/v50/profiles.zcml
++++ b/plone/app/upgrade/v50/profiles.zcml
+@@ -47,4 +47,13 @@
+       for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"
+       provides="Products.GenericSetup.interfaces.EXTENSION"
+       />
++
++  <genericsetup:registerProfile
++      name="to50beta4"
++      title="Upgrade profile for Plone 5006 to Plone 5.0b4"
++      description=""
++      directory="profiles/to_beta4"
++      for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"
++      provides="Products.GenericSetup.interfaces.EXTENSION"
++      />
+ </configure>
+diff --git a/plone/app/upgrade/v50/profiles/to_beta4/registry.xml b/plone/app/upgrade/v50/profiles/to_beta4/registry.xml
+new file mode 100644
+index 0000000..796dadf
+--- /dev/null
++++ b/plone/app/upgrade/v50/profiles/to_beta4/registry.xml
+@@ -0,0 +1,10 @@
++<?xml version="1.0"?>
++<registry>
++  <records interface="Products.CMFPlone.interfaces.ITinyMCESchema"
++           prefix="plone">
++    <value key="content_css">
++      <element>++plone++static/components/tinymce-builded/js/tinymce/skins/lightgray/content.min.css</element>
++    </value>
++  </records>
++
++</registry>
+\ No newline at end of file