summaryrefslogtreecommitdiff
path: root/addons/web
diff options
context:
space:
mode:
authorVidhin Mehta (OpenERP) <vme@tinyerp.com>2011-11-04 16:58:48 +0530
committerVidhin Mehta (OpenERP) <vme@tinyerp.com>2011-11-04 16:58:48 +0530
commit2de28bf033c556b0cf40e22fddeba5ed5e0d8d72 (patch)
tree2622cc75ed95b7051ecf8cb8ba594d3c1608c677 /addons/web
parent0955cc4eeafcf34a8964d31600f7b207c0d8b127 (diff)
[FIX]save and move functionality after update node.
bzr revid: vme@tinyerp.com-20111104112848-gdfj275kyrj2g2qq
Diffstat (limited to 'addons/web')
-rw-r--r--addons/web/static/src/js/view_editor.js12
1 files changed, 7 insertions, 5 deletions
diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 6f31aa75031..f44b063561b 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -503,27 +503,29 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({
var list_obj_xml = _.zip(children_list,obj.child_id);
if (id) {
if (obj.id == id) {
- var parent = $(arch1).parents();
var index = _.indexOf(child_list, obj)
- var re_insert_obj = child_list.splice(index, 1);
if (move_direct == "down") {
var next = $(arch1).next();
$(next).after(arch1);
+ var re_insert_obj = child_list.splice(index, 1);
child_list.splice(index+1, 0, re_insert_obj[0]);
}else if(move_direct == "up"){
var prev = $(arch1).prev();
$(prev).before(arch1);
+ var re_insert_obj = child_list.splice(index, 1);
child_list.splice(index-1, 0, re_insert_obj[0]);
}else if(move_direct == "update_node"){
_.each(update_values, function(val){
+ if(val[1]){
$(arch1).attr(val[0],val[1]);
+ }
});
var new_obj = self.check_attr(arch1,arch1.tagName.toLowerCase(),obj.level);
new_obj.id = obj.id;
self.edit_xml_dialog.$element.find("tr[id='viewedit-"+id+"']").find('a').text(new_obj.name);
- child_list.splice(_.indexOf(child_list, obj), 0, new_obj);
+ child_list.splice(index, 1, new_obj);
}
-
+ var parent = $(arch1).parents();
parent = parent[parent.length-1];
var convert_to_utf = self.xml2Str(parent);
if (convert_to_utf) {
@@ -838,4 +840,4 @@ openerp.web.ViewEditor.property_widget = new openerp.web.Registry({
'type': 'openerp.web.ViewEditor.ButtonTypeProperty',
'target': 'openerp.web.ViewEditor.ButtonTargetProperty'
});
-}; \ No newline at end of file
+};