Author: jmorliaguet
Date: Sat Jun 24 13:40:17 2006
New Revision: 3510
Modified:
cpsskins/branches/paris-sprint-2006/clientstorage.py
cpsskins/branches/paris-sprint-2006/doc/utils.txt
cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/views.py
cpsskins/branches/paris-sprint-2006/ui/screens/common/views.py
cpsskins/branches/paris-sprint-2006/ui/screens/elementeditor/views.py
cpsskins/branches/paris-sprint-2006/utils.py
Log:
- the clientstorage take a 'request' argument. removed getRequest() which won't
work under Five
Modified: cpsskins/branches/paris-sprint-2006/clientstorage.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/clientstorage.py (original)
+++ cpsskins/branches/paris-sprint-2006/clientstorage.py Sat Jun 24
13:40:17 2006
@@ -20,14 +20,13 @@
from urllib import quote, unquote
from cpsskins import minjson as json
-from cpsskins.utils import getRequest
class ClientStorage(object):
"""A client-side storage (the information is stored in cookies)
"""
- def __init__(self, id):
+ def __init__(self, id, request):
self.storage_id = u'cpsskins_local_storage_%s' % id
- self.request = getRequest()
+ self.request = request
if self.data is None:
self.data = {}
Modified: cpsskins/branches/paris-sprint-2006/doc/utils.txt
==============================================================================
--- cpsskins/branches/paris-sprint-2006/doc/utils.txt (original)
+++ cpsskins/branches/paris-sprint-2006/doc/utils.txt Sat Jun 24 13:40:17 2006
@@ -71,39 +71,6 @@
someOtherClass
-getRequest
-----------
-
-getRequest() returns the request from the current interaction. It is used
-mainly to access the client session storage (via request.cookies) without
-creating a view.
-
- >>> from zope.publisher.browser import TestRequest
- >>> from zope.security.management import endInteraction
- >>> from zope.security.management import newInteraction
- >>> from zope.security.management import restoreInteraction
- >>> from cpsskins.utils import getRequest
-
- >>> endInteraction()
-
-If there is no interaction an exception is raised:
-
- >>> getRequest()
- Traceback (most recent call last):
- ...
- NoInteraction
-
- >>> request = TestRequest()
- >>> newInteraction(request)
-
-otherwise we get the request:
-
- >>> getRequest() is request
- True
-
- >>> restoreInteraction()
-
-
cloneObject
-----------
Modified:
cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/views.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/views.py
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/views.py
Sat Jun 24 13:40:17 2006
@@ -40,8 +40,8 @@
self.context = context
self.request = request
self.tmutil = getThemeManager(context)
- self.element_data = ClientStorage(u'element-editor')
- self.style_data = ClientStorage(u'style-editor-data')
+ self.element_data = ClientStorage(u'element-editor', request)
+ self.style_data = ClientStorage(u'style-editor-data', request)
def getWidgetTypes(self):
element_id = self.element_data['id']
Modified: cpsskins/branches/paris-sprint-2006/ui/screens/common/views.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/common/views.py
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/common/views.py Sat Jun
24 13:40:17 2006
@@ -148,7 +148,7 @@
def __init__(self, context, request):
self.context = context
self.request = request
- self.data = ClientStorage(u'panels')
+ self.data = ClientStorage(u'panels', request)
def selectPortletProvider(self, provider=DEFAULT_PROVIDER):
current_provider = self.data['provider']
@@ -453,7 +453,7 @@
def __init__(self, context, request):
self.context = context
self.request = request
- self.data = ClientStorage(u'editor')
+ self.data = ClientStorage(u'editor', request)
def getHint(self, msgid):
return json.write({
Modified: cpsskins/branches/paris-sprint-2006/ui/screens/elementeditor/views.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/elementeditor/views.py
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/elementeditor/views.py
Sat Jun 24 13:40:17 2006
@@ -36,7 +36,7 @@
def __init__(self, context, request):
self.context = context
self.request = request
- self.data = ClientStorage(u'element-editor')
+ self.data = ClientStorage(u'element-editor', request)
def setEditorTab(self, name=u''):
self.data['tab'] = name
@@ -67,7 +67,7 @@
def __init__(self, context, request):
self.context = context
self.request = request
- self.data = ClientStorage(u'element-editor')
+ self.data = ClientStorage(u'element-editor', request)
def getAbsoluteURL(self, object):
return getMultiAdapter((object, self.request), name=u'absolute_url')()
Modified: cpsskins/branches/paris-sprint-2006/utils.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/utils.py (original)
+++ cpsskins/branches/paris-sprint-2006/utils.py Sat Jun 24 13:40:17 2006
@@ -62,13 +62,6 @@
def getClientStorageId(id):
return u'cpsskins_local_storage_%s' % id
-def getRequest():
- interaction = getInteraction()
- for p in interaction.participations:
- if IRequest.providedBy(p):
- return p
- raise RuntimeError("No IRequest in interaction")
-
def cloneObject(obj):
"""Clone an object. the security proxy is removed
"""
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
