Author: jmorliaguet
Date: Sat Jun 17 17:39:05 2006
New Revision: 3435
Modified:
cpsskins/branches/paris-sprint-2006/elements/portlet.py
cpsskins/branches/paris-sprint-2006/lib/cpsskins/src/cpsskins.js
cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.js
Log:
- some drag-and-drop fixes
Modified: cpsskins/branches/paris-sprint-2006/elements/portlet.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/elements/portlet.py (original)
+++ cpsskins/branches/paris-sprint-2006/elements/portlet.py Sat Jun 17
17:39:05 2006
@@ -24,6 +24,7 @@
from zope.copypastemove import ObjectMover
from zope.copypastemove.interfaces import IObjectMover
from zope.interface import implements
+from zope.security.proxy import removeSecurityProxy
from zope.traversing.api import getName, getParent
from cpsskins.elements.interfaces import IPortlet, ISlot, IBase
@@ -73,7 +74,7 @@
Returns the new name within the target.
"""
- portlet = self.context
+ portlet = removeSecurityProxy(self.context)
parent = getParent(portlet)
isSlot = ISlot.providedBy
Modified: cpsskins/branches/paris-sprint-2006/lib/cpsskins/src/cpsskins.js
==============================================================================
--- cpsskins/branches/paris-sprint-2006/lib/cpsskins/src/cpsskins.js
(original)
+++ cpsskins/branches/paris-sprint-2006/lib/cpsskins/src/cpsskins.js Sat Jun
17 17:39:05 2006
@@ -978,6 +978,7 @@
this._containerzones.each(function(s) {
if (Position.within(s, x, y)) {
s.appendChild(this.dragged);
+ this.droptarget = s;
return;
};
}.bind(this));
Modified: cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.js
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.js
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.js Sat Jun
17 17:39:05 2006
@@ -24,12 +24,14 @@
}
function moveElement(info) {
- var id = info.target.getAttribute('id');
- var data = CPSSkins.getModelById('m' + id).getData();
+ var src_id = info.source.getAttribute('id');
+ var src_data = CPSSkins.getModelById('m' + src_id).getData();
+ var dest_id = info.target.getAttribute('id');
+ var dest_data = CPSSkins.getModelById('m' + dest_id).getData();
var args = {
- src_id: info.source.getAttribute('id'),
- dest_id: id,
- order: data.order
+ src_id: src_data.id,
+ dest_id: dest_data.id,
+ order: dest_data.order
}
var options = {
parameters: $H(args).toQueryString(),
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
