[MERGE]merge with main branch.

bzr revid: vme@tinyerp.com-20111111053703-r8gx2w67t0w38jp7

1 files changed, 20 insertions, 20 deletions

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 2008a5d2129..376eed6fe71 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -32,7 +32,8 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 action_buttons: false,
                 search_view: false,
                 pager: false,
-                radio: true
+                radio: true,
+                select_view_id: self.parent.fields_view.view_id
             },
         };
         this.view_edit_dialog = new openerp.web.Dialog(this, {
@@ -53,6 +54,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 }
             },
         }).start().open();
+        this.main_view_id = this.parent.fields_view.view_id;
         var action_manager = new openerp.web.ActionManager(this);
         action_manager.appendTo(this.view_edit_dialog);
         $.when(action_manager.do_action(action)).then(function() {
@@ -572,7 +574,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 var value = _.detect(arch_val[0]['att_list'],function(res) {
                     return _.include(res, id);
                 });
-                if (id == 'groups') type_widget.value = self.groups;
+                if (id == 'groups') type_widget.selection = self.groups;
                 self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr><td align="right">'+id+':</td><td>'+type_widget.render()+'</td></tr>');
                 type_widget.start();
                 type_widget.set_value(value);
@@ -630,9 +632,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     "Update": function(){
                         var update_values = [];
                         _.each(self.edit_widget, function(widget) {
-                            if (widget.dirty) {
-                                update_values.push(widget.get_value());
-                            }
+                            update_values.push(widget.get_value());
                         });
                     },
                     "Cancel": function(){
@@ -645,7 +645,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         var table_selector = self.add_node_dialog.$element.find('table[id=rec_table]');
         _.each(render_list,function(node){
             type_widget = new openerp.web.ViewEditor.FieldSelect (self.add_node_dialog, node[0]);
-            type_widget.value = node[1];
+            type_widget.selection = node[1];
             if(node[0]=="Fields"){ node[0] = "";}
             table_selector.append('<tr><td align="right">'+node[0]+'</td><td>'+type_widget.render()+'</td></tr>');
             type_widget.start();
@@ -664,7 +664,6 @@ openerp.web.ViewEditor.Field = openerp.web.Class.extend({
         this.$element = view.$element;
         this.dirty = false;
         this.name = id;
-        this.value = undefined;
     },
     on_ui_change: function() {
         this.dirty = true;
@@ -714,17 +713,18 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
         this.$element.find("select[id=" + this.name + "]").css('width', '100%').change(function() {
             self.on_ui_change();
             add_node = self.get_value();
-            if(add_node[0] == "node_type" && add_node[1] == "field" ){
-                self.$element.find("select[id=Fields]").show();
-            }else{self.$element.find("select[id=Fields]").hide();}
+            if(add_node[0] == "node_type"){
+                if(add_node[1] == "field"){self.$element.find("select[id=Fields]").show();}
+                else{self.$element.find("select[id=Fields]").hide();}
+            }
         });
     },
     set_value: function(value) {
         value = value === null ? false : value;
         value = value instanceof Array ? value[1] : value;
         var index = 0;
-        for (var i = 0, ii = this.value.length; i < ii; i++) {
-            if ((this.value[i] instanceof Array && this.value[i][1] === value) || this.value[i] === value) index = i;
+        for (var i = 0, ii = this.selection.length; i < ii; i++) {
+            if ((this.selection[i] instanceof Array && this.selection[i][1] === value) || this.selection[i] === value) index = i;
         }
         this.$element.find("select[id=" + this.name + "]")[0].selectedIndex = index;
     },
@@ -740,43 +740,43 @@ openerp.web.ViewEditor.WidgetProperty = openerp.web.ViewEditor.FieldSelect.exten
         var values = _.keys(this.registry.map);
         values.push('');
         values.sort();
-        this.value = values;
+        this.selection = values;
     },
 });
 openerp.web.ViewEditor.IconProperty = openerp.web.ViewEditor.FieldSelect.extend({
     init: function(view, id) {
         this._super(view, id);
-        this.value = icons;
+        this.selection = icons;
     },
 });
 openerp.web.ViewEditor.ButtonTargetProperty = openerp.web.ViewEditor.FieldSelect.extend({
     init: function(view, id) {
         this._super(view, id);
-        this.value = [['', ''], ['new', 'New Window']];
+        this.selection = [['', ''], ['new', 'New Window']];
     },
 });
 openerp.web.ViewEditor.ButtonTypeProperty = openerp.web.ViewEditor.FieldSelect.extend({
     init: function(view, id) {
         this._super(view, id);
-        this.value = [['', ''], ['action', 'Action'], ['object', 'Object'], ['workflow', 'Workflow'], ['server_action', 'Server Action']];
+        this.selection = [['', ''], ['action', 'Action'], ['object', 'Object'], ['workflow', 'Workflow'], ['server_action', 'Server Action']];
     },
 });
 openerp.web.ViewEditor.AlignProperty = openerp.web.ViewEditor.FieldSelect.extend({
     init: function(view, id) {
         this._super(view, id);
-        this.value = [['', ''], ['0.0', 'Left'], ['0.5', 'Center'], ['1.0', 'Right']];
+        this.selection = [['', ''], ['0.0', 'Left'], ['0.5', 'Center'], ['1.0', 'Right']];
     },
 });
 openerp.web.ViewEditor.ButtonSpecialProperty = openerp.web.ViewEditor.FieldSelect.extend({
     init: function(view, id) {
         this._super(view, id);
-        this.value = [['',''],['save', 'Save Button'], ['cancel', 'Cancel Button'], ['open', 'Open Button']];
+        this.selection = [['',''],['save', 'Save Button'], ['cancel', 'Cancel Button'], ['open', 'Open Button']];
     },
 });
 openerp.web.ViewEditor.PositionProperty = openerp.web.ViewEditor.FieldSelect.extend({
     init: function(view, id) {
         this._super(view, id);
-        this.value = [['',''],['after', 'After'],['before', 'Before'],['inside', 'Inside'],['replace', 'Replace']];
+        this.selection = [['',''],['after', 'After'],['before', 'Before'],['inside', 'Inside'],['replace', 'Replace']];
     },
 });
 openerp.web.ViewEditor.GroupsProperty = openerp.web.ViewEditor.FieldSelect.extend({
@@ -792,7 +792,7 @@ openerp.web.ViewEditor.GroupsProperty = openerp.web.ViewEditor.FieldSelect.exten
         var self = this;
         self.$element.find("#groups option").attr("selected",false);
         if (!value) return false;
-        _.each(this.value, function(item) {
+        _.each(this.selection, function(item) {
             if (_.include(value[1].split(','), item[0])) {
                 self.$element.find("select[id="+self.name+"] option[value='" + item[0] +"']").attr("selected",1)
             }