1 files changed, 22 insertions, 19 deletions
diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index a2a927fa86d..97304bbb679 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -1,11 +1,11 @@
 openerp.web.view_editor = function(openerp) {
 var _t = openerp.web._t;
 var QWeb = openerp.web.qweb;
-openerp.web.ViewEditor =   openerp.web.Widget.extend({
+openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
     init: function(parent, element_id, dataset, view, options) {
         this._super(parent);
-        this.element_id = element_id
-        this.parent = parent
+        this.element_id = element_id;
+        this.parent = parent;
         this.dataset = new openerp.web.DataSetSearch(this, 'ir.ui.view', null, null),
         this.model = dataset.model;
         this.xml_element_id = 0;
@@ -108,7 +108,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 type_widget.dirty = true;
             }
             type_widget.start();
-            type_widget.set_value(value)
+            type_widget.set_value(value);
             self.create_view_widget.push(type_widget);
         });
     },
@@ -178,7 +178,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             'att_list': [],
             'name': this.add_node_name(node),
             'child_id': []
-        }
+        };
         ViewNode.att_list.push(node.tagName.toLowerCase());
         _.each(node.attributes, function(att) {
             ViewNode.att_list.push([att.nodeName, att.nodeValue]);
@@ -578,7 +578,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             var check = _.detect(one_object , function(obj) {
                 return id == obj.id;
             });
-            if (check) {result.push(check);};
+            if (check) {result.push(check);}
             _.each(one_object, function(obj) {
                self.get_object_by_id(id,obj.child_id, result);
             });
@@ -819,7 +819,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             values.push('');
             values.sort();
             _PROPERTIES_ATTRIBUTES['widget']['selection'] = values;
-            var widgets = _.filter(_PROPERTIES_ATTRIBUTES, function(property){ return _.include(properties, property.name)})
+            var widgets = _.filter(_PROPERTIES_ATTRIBUTES, function (property) { return _.include(properties, property.name)});
             _.each(widgets, function(widget) {
                 var type_widget =  new (self.property.get_any([widget.type])) (self.edit_node_dialog, widget);
                 var value = _.detect(arch_val[0]['att_list'],function(res) {
@@ -845,24 +845,27 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         var group_ids = [], group_names = {}, groups = [];
         var res_groups = new openerp.web.DataSetSearch(this,'res.groups', null, null),
             model_data = new openerp.web.DataSetSearch(self,'ir.model.data', null, null);
-            res_groups
-            .read_slice([], {})
-            .done(function(res_grp) {
-                _.each(res_grp,function(res){
+            res_groups.read_slice([], {}).done(function (res_grp) {
+                _.each(res_grp, function (res) {
                     var key = res.id;
+<<<<<<< TREE
                     group_names[key]=res.full_name;
+=======
+                    group_names[key] = res.name;
+>>>>>>> MERGE-SOURCE
                     group_ids.push(res.id);
                 });
-                model_data
-                .read_slice([],{domain:[['res_id', 'in', group_ids],['model','=','res.groups']]})
-                .done(function(model_grp) {
-                    _.each(model_grp, function(res_group) {
-                        groups.push([res_group.module + "." + res_group.name,group_names[res_group.res_id]]);
+                model_data.read_slice([], {domain: [
+                    ['res_id', 'in', group_ids],
+                    ['model', '=', 'res.groups']
+                ]}).done(function (model_grp) {
+                    _.each(model_grp, function (res_group) {
+                        groups.push([res_group.module + "." + res_group.name, group_names[res_group.res_id]]);
                     });
                     self.groups = groups;
                     def.resolve();
                 });
-            })
+            });
         return def.promise();
     },
     on_add_node: function(properties, fields){
@@ -925,7 +928,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
     render_new_field :function(id){
         var self = this;
         var action = {
-            context: {'default_model_id': id, 'manual':true},
+            context: {'default_model_id': id, 'manual': true},
             res_model: "ir.model.fields",
             views: [[false, 'form']],
             type: 'ir.actions.act_window',
@@ -933,7 +936,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             flags: {
                 action_buttons: true
             }
-        }
+        };
         var action_manager = new openerp.web.ActionManager(self);
         $.when(action_manager.do_action(action)).then(function() {
             var controller = action_manager.dialog_viewmanager.views['form'].controller;