Author: jmorliaguet
Date: Sun May 28 13:31:03 2006
New Revision: 3259
Modified:
cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.js
cpsskins/branches/paris-sprint-2006/ui/screens/common/views.py
Log:
- fixes
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 Sun May
28 13:31:03 2006
@@ -17,11 +17,12 @@
function insertPortlet(info) {
var url = '@@insertElement';
var id = info.target.getAttribute('id');
- var model = CPSSkins.getModelById('m' + id);
+ var data = CPSSkins.getModelById('m' + id).getData();
+ var order = data.container ? 0 : data.order;
var args = {
id: id,
type_name: info.source.getAttribute('type_name'),
- order: model.order
+ order: order
}
var options = {
parameters: $H(args).toQueryString(),
@@ -33,11 +34,11 @@
function moveElement(info) {
var url = '@@moveElement';
var id = info.target.getAttribute('id');
- var model = CPSSkins.getModelById('m' + id);
+ var data = CPSSkins.getModelById('m' + id).getData();
var args = {
src_id: info.source.getAttribute('id'),
dest_id: id,
- order: model.order
+ order: data.order
}
var options = {
parameters: $H(args).toQueryString(),
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 May
28 13:31:03 2006
@@ -88,7 +88,7 @@
def getModel(self):
context = self.context
request = self.request
- id = self.context.identifier
+ id = context.identifier
authoring = getMultiAdapter((context, request), IAuthoring,
name='authoring')
return json.write({
@@ -97,6 +97,7 @@
'id': id,
'editable': True,
'order': authoring.getElementOrder(id),
+ 'container': IInnerNode.providedBy(context),
}
})
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
