-
-
Notifications
You must be signed in to change notification settings - Fork 75
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Branch: refs/heads/master Date: 2016-10-09T23:43:08+02:00 Author: Jens W. Klein (jensens) <[email protected]> Commit: plone/plone.app.upgrade@53ae082 Products.MimetypesRegistry has no longer a skins layer, remove it. Files changed: M CHANGES.rst M plone/app/upgrade/v51/betas.py M plone/app/upgrade/v51/configure.zcml Repository: plone.app.upgrade Branch: refs/heads/master Date: 2016-10-18T16:31:41-04:00 Author: agitator (agitator) <[email protected]> Commit: plone/plone.app.upgrade@299c160 Merge pull request #90 from plone/remove-skins-of-mtr Products.MimetypesRegistry has no longer a skins layer, remove it. Files changed: M CHANGES.rst M plone/app/upgrade/v51/betas.py M plone/app/upgrade/v51/configure.zcml
- Loading branch information
Showing
1 changed file
with
116 additions
and
62 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,102 +1,156 @@ | ||
| Repository: plone.app.blob | ||
| Repository: plone.app.upgrade | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2016-10-18T13:54:24-04:00 | ||
| Date: 2016-10-09T23:43:08+02:00 | ||
| Author: Jens W. Klein (jensens) <[email protected]> | ||
| Commit: https://github.com/plone/plone.app.blob/commit/0c954610cad6f7638382ab60d8407bd3ab1ab9f6 | ||
| Commit: https://github.com/plone/plone.app.upgrade/commit/53ae082569ea7f34fd3819c48282c3b64742978e | ||
|
|
||
| More flexible test of getIcon. | ||
| Products.MimetypesRegistry has no longer a skins layer, remove it. | ||
|
|
||
| Files changed: | ||
| M CHANGES.rst | ||
| M src/plone/app/blob/tests/test_integration.py | ||
| M plone/app/upgrade/v51/betas.py | ||
| M plone/app/upgrade/v51/configure.zcml | ||
|
|
||
| diff --git a/CHANGES.rst b/CHANGES.rst | ||
| index 8ca2c0c..6c999d6 100644 | ||
| index 760d838..6ace74f 100644 | ||
| --- a/CHANGES.rst | ||
| +++ b/CHANGES.rst | ||
| @@ -17,6 +17,10 @@ Bug fixes: | ||
| - Add coding headers on python files. | ||
| [gforcada] | ||
| @@ -10,6 +10,9 @@ Breaking changes: | ||
|
|
||
| +- More flexible test of getIcon. | ||
| New features: | ||
|
|
||
| +- Products.MimetypesRegistry has no longer a skins layer, remove it. | ||
| + [jensens] | ||
| + | ||
| - Add sort_on field to search controlpanel. | ||
| [rodfersou] | ||
|
|
||
| diff --git a/plone/app/upgrade/v51/betas.py b/plone/app/upgrade/v51/betas.py | ||
| index 8ba9cf5..d17b02c 100644 | ||
| --- a/plone/app/upgrade/v51/betas.py | ||
| +++ b/plone/app/upgrade/v51/betas.py | ||
| @@ -1,4 +1,5 @@ | ||
| # -*- coding: utf-8 -*- | ||
| +from plone.app.upgrade.utils import cleanUpSkinsTool | ||
| from plone.app.upgrade.utils import loadMigrationProfile | ||
| from plone.registry.interfaces import IRegistry | ||
| from Products.CMFCore.utils import getToolByName | ||
| @@ -17,7 +18,7 @@ def to51beta1(context): | ||
|
|
||
| def addSortOnProperty(context): | ||
| """Add sort_on field to search controlpanel. | ||
| - | ||
| + | ||
| The default value of this field is relevance. | ||
| """ | ||
| # get the old site properties | ||
| @@ -45,3 +46,9 @@ def addSortOnProperty(context): | ||
| settings.sort_on = 'relevance' | ||
| logger.log(logging.INFO, | ||
| "Added 'sort_on' property to site_properties.") | ||
| + | ||
| 1.6.4 (2016-08-12) | ||
| ------------------ | ||
| + | ||
| +def remove_leftover_skin_layers(context): | ||
| + """Products.MimetypesRegistry no longer has a skin layer, remove it. | ||
| + """ | ||
| + cleanUpSkinsTool(context) | ||
| diff --git a/plone/app/upgrade/v51/configure.zcml b/plone/app/upgrade/v51/configure.zcml | ||
| index 53b8399..6e2dcc9 100644 | ||
| --- a/plone/app/upgrade/v51/configure.zcml | ||
| +++ b/plone/app/upgrade/v51/configure.zcml | ||
| @@ -57,6 +57,12 @@ Add new Mockup 2.4.0 relateditems resource url. | ||
| handler=".betas.addSortOnProperty" | ||
| /> | ||
|
|
||
| diff --git a/src/plone/app/blob/tests/test_integration.py b/src/plone/app/blob/tests/test_integration.py | ||
| index df26a73..83679b1 100644 | ||
| --- a/src/plone/app/blob/tests/test_integration.py | ||
| +++ b/src/plone/app/blob/tests/test_integration.py | ||
| @@ -153,11 +153,11 @@ def testRangeSupport(self): | ||
| def testIcon(self): | ||
| blob = self.folder.blob | ||
| blob.update(file=getImage()) | ||
| - self.assertEqual(blob.getIcon(), 'plone/image.png') | ||
| + self.assertTrue(blob.getIcon().endswith('image.png')) | ||
| blob.update(file=pdf_data) | ||
| - self.assertEqual(blob.getIcon(), 'plone/pdf.png') | ||
| + self.assertTrue(blob.getIcon().endswith('pdf.png')) | ||
| blob.update(file='some text...') | ||
| - self.assertEqual(blob.getIcon(), 'plone/txt.png') | ||
| + self.assertTrue(blob.getIcon().endswith('txt.png')) | ||
| + <gs:upgradeStep | ||
| + title="Remove skins layer converted to browser resources" | ||
| + description="Products.MimetypesRegistry Icons no longer with skins" | ||
| + handler=".betas.remove_leftover_skin_layers" | ||
| + /> | ||
| + | ||
| </gs:upgradeSteps> | ||
|
|
||
| def testIconLookupForUnknownMimeType(self): | ||
| """ test for http://plone.org/products/plone.app.blob/issues/1 """ | ||
| </configure> | ||
|
|
||
|
|
||
| Repository: plone.app.blob | ||
| Repository: plone.app.upgrade | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2016-10-18T16:22:30-04:00 | ||
| Author: Jens W. Klein (jensens) <[email protected]> | ||
| Commit: https://github.com/plone/plone.app.blob/commit/ce1285f5c1d652ba9afcf10dffb83392e1e4944f | ||
| Date: 2016-10-18T16:31:41-04:00 | ||
| Author: agitator (agitator) <[email protected]> | ||
| Commit: https://github.com/plone/plone.app.upgrade/commit/299c160da43431b57ac535aec41cb7632fa7211f | ||
|
|
||
| Merge pull request #32 from plone/more-flexible-icon-test | ||
| Merge pull request #90 from plone/remove-skins-of-mtr | ||
|
|
||
| More flexible test of getIcon. | ||
| Products.MimetypesRegistry has no longer a skins layer, remove it. | ||
|
|
||
| Files changed: | ||
| M CHANGES.rst | ||
| M src/plone/app/blob/tests/test_integration.py | ||
| M plone/app/upgrade/v51/betas.py | ||
| M plone/app/upgrade/v51/configure.zcml | ||
|
|
||
| diff --git a/CHANGES.rst b/CHANGES.rst | ||
| index 8ca2c0c..6c999d6 100644 | ||
| index 760d838..6ace74f 100644 | ||
| --- a/CHANGES.rst | ||
| +++ b/CHANGES.rst | ||
| @@ -17,6 +17,10 @@ Bug fixes: | ||
| - Add coding headers on python files. | ||
| [gforcada] | ||
| @@ -10,6 +10,9 @@ Breaking changes: | ||
|
|
||
| +- More flexible test of getIcon. | ||
| New features: | ||
|
|
||
| +- Products.MimetypesRegistry has no longer a skins layer, remove it. | ||
| + [jensens] | ||
| + | ||
| - Add sort_on field to search controlpanel. | ||
| [rodfersou] | ||
|
|
||
| diff --git a/plone/app/upgrade/v51/betas.py b/plone/app/upgrade/v51/betas.py | ||
| index 8ba9cf5..d17b02c 100644 | ||
| --- a/plone/app/upgrade/v51/betas.py | ||
| +++ b/plone/app/upgrade/v51/betas.py | ||
| @@ -1,4 +1,5 @@ | ||
| # -*- coding: utf-8 -*- | ||
| +from plone.app.upgrade.utils import cleanUpSkinsTool | ||
| from plone.app.upgrade.utils import loadMigrationProfile | ||
| from plone.registry.interfaces import IRegistry | ||
| from Products.CMFCore.utils import getToolByName | ||
| @@ -17,7 +18,7 @@ def to51beta1(context): | ||
|
|
||
| def addSortOnProperty(context): | ||
| """Add sort_on field to search controlpanel. | ||
| - | ||
| + | ||
| The default value of this field is relevance. | ||
| """ | ||
| # get the old site properties | ||
| @@ -45,3 +46,9 @@ def addSortOnProperty(context): | ||
| settings.sort_on = 'relevance' | ||
| logger.log(logging.INFO, | ||
| "Added 'sort_on' property to site_properties.") | ||
| + | ||
| + | ||
| 1.6.4 (2016-08-12) | ||
| ------------------ | ||
| +def remove_leftover_skin_layers(context): | ||
| + """Products.MimetypesRegistry no longer has a skin layer, remove it. | ||
| + """ | ||
| + cleanUpSkinsTool(context) | ||
| diff --git a/plone/app/upgrade/v51/configure.zcml b/plone/app/upgrade/v51/configure.zcml | ||
| index 53b8399..6e2dcc9 100644 | ||
| --- a/plone/app/upgrade/v51/configure.zcml | ||
| +++ b/plone/app/upgrade/v51/configure.zcml | ||
| @@ -57,6 +57,12 @@ Add new Mockup 2.4.0 relateditems resource url. | ||
| handler=".betas.addSortOnProperty" | ||
| /> | ||
|
|
||
| diff --git a/src/plone/app/blob/tests/test_integration.py b/src/plone/app/blob/tests/test_integration.py | ||
| index df26a73..83679b1 100644 | ||
| --- a/src/plone/app/blob/tests/test_integration.py | ||
| +++ b/src/plone/app/blob/tests/test_integration.py | ||
| @@ -153,11 +153,11 @@ def testRangeSupport(self): | ||
| def testIcon(self): | ||
| blob = self.folder.blob | ||
| blob.update(file=getImage()) | ||
| - self.assertEqual(blob.getIcon(), 'plone/image.png') | ||
| + self.assertTrue(blob.getIcon().endswith('image.png')) | ||
| blob.update(file=pdf_data) | ||
| - self.assertEqual(blob.getIcon(), 'plone/pdf.png') | ||
| + self.assertTrue(blob.getIcon().endswith('pdf.png')) | ||
| blob.update(file='some text...') | ||
| - self.assertEqual(blob.getIcon(), 'plone/txt.png') | ||
| + self.assertTrue(blob.getIcon().endswith('txt.png')) | ||
| + <gs:upgradeStep | ||
| + title="Remove skins layer converted to browser resources" | ||
| + description="Products.MimetypesRegistry Icons no longer with skins" | ||
| + handler=".betas.remove_leftover_skin_layers" | ||
| + /> | ||
| + | ||
| </gs:upgradeSteps> | ||
|
|
||
| def testIconLookupForUnknownMimeType(self): | ||
| """ test for http://plone.org/products/plone.app.blob/issues/1 """ | ||
| </configure> | ||
|
|
||
|
|