Author: jmorliaguet
Date: Sun Jun 4 23:14:02 2006
New Revision: 3304
Modified:
cpsskins/branches/paris-sprint-2006/browser/rendering/viewer.py
cpsskins/branches/paris-sprint-2006/ui/screens/common/views.py
cpsskins/branches/paris-sprint-2006/ui/screens/contentauthor/filters/slot.pt
Log:
- fixes to make it possible to add portlets into slots again
Modified: cpsskins/branches/paris-sprint-2006/browser/rendering/viewer.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/browser/rendering/viewer.py
(original)
+++ cpsskins/branches/paris-sprint-2006/browser/rendering/viewer.py Sun Jun
4 23:14:02 2006
@@ -72,7 +72,6 @@
negotiation = getMultiAdapter((element, request),
INegotiation, 'negotiation')
perspective = negotiation.getPerspective()
- perspective = u'default'
# update global context info variables passed as keyword parameters
globals = ContextInfo(kw)
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 Sun Jun
4 23:14:02 2006
@@ -26,6 +26,7 @@
from zope.interface import implements, Interface
from zope.lifecycleevent import ObjectCreatedEvent
from zope.location.traversing import LocationPhysicallyLocatable
+from zope.security.proxy import removeSecurityProxy
from zope.traversing.api import getName, getParent
from cpsskins import minjson as json
@@ -313,7 +314,7 @@
request = self.request
dest_element = self.tmutil.getElementById(id)
if IInnerNode.providedBy(dest_element):
- container = dest_element
+ container = removeSecurityProxy(dest_element)
else:
container = getParent(dest_element)
order = self.getElementOrder(id)
Modified:
cpsskins/branches/paris-sprint-2006/ui/screens/contentauthor/filters/slot.pt
==============================================================================
---
cpsskins/branches/paris-sprint-2006/ui/screens/contentauthor/filters/slot.pt
(original)
+++
cpsskins/branches/paris-sprint-2006/ui/screens/contentauthor/filters/slot.pt
Sun Jun 4 23:14:02 2006
@@ -5,7 +5,11 @@
id context/identifier;
icon context/@@getIcon">
- <div class="slotFrame container portletTarget" render="1"
+ <ins class="model"
+ tal:define="info options/info; model nocall:context/@@getModel"
+ tal:content="python: model(info)" />
+
+ <div class="slotFrame container portletTarget"
tal:attributes="id id; targetid id">
<div class="title" tal:content="slot_title|slot_name" />
<div class="body" tal:condition="markup"
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
