plone.restapi/plone-only-login: Support content reording on site root + support setting layo

Repository: plone.restapi
Branch: refs/heads/plone-only-login
Date: 2017-07-01T14:32:00+02:00
Author: Roel Bruggink (jaroel) <roel-Ttk/PUy0oENmR6Xm/[email protected]>
Commit: https://github.com/plone/plone.restapi/commit/8302869cc31678d6f94ab98fee37bd34f7c2a185

Support content reording on site root + support setting layout on site root

Files changed:
M src/plone/restapi/deserializer/site.py
M src/plone/restapi/tests/mixin_ordering.py
M src/plone/restapi/tests/test_atcontent_deserializer.py
M src/plone/restapi/tests/test_dxcontent_deserializer.py
M src/plone/restapi/tests/test_site_deserializer.py

diff --git a/src/plone/restapi/deserializer/site.py b/src/plone/restapi/deserializer/site.py
index e1336ded..7b749383 100644
--- a/src/plone/restapi/deserializer/site.py
+++ b/src/plone/restapi/deserializer/site.py
@@ -3,14 +3,14 @@
 from plone.restapi.deserializer import json_body
 from plone.restapi.interfaces import IDeserializeFromJson
 from zope.component import adapter
-from zope.interface import implementer, Interface
+from zope.interface import implementer
 
 from plone.restapi.deserializer.mixins import OrderingMixin
 from zope.publisher.interfaces import IRequest
 
 
 @implementer(IDeserializeFromJson)
-@adapter(IPloneSiteRoot, Interface)
+@adapter(IPloneSiteRoot, IRequest)
 class DeserializeSiteRootFromJson(OrderingMixin, object):
     """JSON deserializer for the Plone site root
     """
@@ -29,7 +29,7 @@ def __call__(self, validate_all=False):
             self.context.setLayout(layout)
 
         # OrderingMixin
-        if 'ordering' in data and not 'subset_ids' in data['ordering']:
+        if 'ordering' in data and 'subset_ids' not in data['ordering']:
             data['ordering']['subset_ids'] = self.context.contentIds()
         self.handle_ordering(data)
 
diff --git a/src/plone/restapi/tests/mixin_ordering.py b/src/plone/restapi/tests/mixin_ordering.py
index dcd9c532..180cc0e8 100644
--- a/src/plone/restapi/tests/mixin_ordering.py
+++ b/src/plone/restapi/tests/mixin_ordering.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import json
 
 from zExceptions import BadRequest
@@ -95,4 +96,4 @@ def test_reorder_subsetids(self):
         self.assertEquals(
             u'Client/server ordering mismatch',
             cm.exception.message
-        )
\ No newline at end of file
+        )
diff --git a/src/plone/restapi/tests/test_atcontent_deserializer.py b/src/plone/restapi/tests/test_atcontent_deserializer.py
index 1a8fe094..a97f3cbd 100644
--- a/src/plone/restapi/tests/test_atcontent_deserializer.py
+++ b/src/plone/restapi/tests/test_atcontent_deserializer.py
@@ -18,7 +18,6 @@
 from Products.Archetypes.interfaces import IObjectPreValidation
 
 
-import json
 import unittest
 
 
@@ -154,8 +153,6 @@ def test_set_layout(self):
         self.assertEquals('my_new_layout', self.doc1.getLayout())
 
 
-
-
 class TestValidationRequest(unittest.TestCase):
 
     layer = PLONE_RESTAPI_AT_INTEGRATION_TESTING
diff --git a/src/plone/restapi/tests/test_dxcontent_deserializer.py b/src/plone/restapi/tests/test_dxcontent_deserializer.py
index 264691c4..26fd2411 100644
--- a/src/plone/restapi/tests/test_dxcontent_deserializer.py
+++ b/src/plone/restapi/tests/test_dxcontent_deserializer.py
@@ -12,7 +12,6 @@
 from zope.component import provideHandler
 from zope.lifecycleevent.interfaces import IObjectModifiedEvent
 
-import json
 import unittest
 
 
diff --git a/src/plone/restapi/tests/test_site_deserializer.py b/src/plone/restapi/tests/test_site_deserializer.py
index ad17514d..4374a46b 100644
--- a/src/plone/restapi/tests/test_site_deserializer.py
+++ b/src/plone/restapi/tests/test_site_deserializer.py
@@ -1,18 +1,9 @@
 # -*- coding: utf-8 -*-
-from plone.app.testing import TEST_USER_ID
-from plone.app.testing import setRoles
-from plone.dexterity.interfaces import IDexterityItem
-from plone.restapi.exceptions import DeserializationError
 from plone.restapi.interfaces import IDeserializeFromJson
 from plone.restapi.testing import PLONE_RESTAPI_DX_INTEGRATION_TESTING
-from plone.restapi.tests.dxtypes import ITestAnnotationsBehavior
 from plone.restapi.tests.mixin_ordering import OrderingMixin
-from zExceptions import BadRequest
 from zope.component import getMultiAdapter
-from zope.component import provideHandler
-from zope.lifecycleevent.interfaces import IObjectModifiedEvent
 
-import json
 import unittest
 
 



------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot