[Merge]merge with main branch.

bzr revid: vme@tinyerp.com-20111122085146-khp27cdcja9e8gac

1 files changed, 2 insertions, 3 deletions

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 173b3bfc4f0..9a8d5c7268e 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -295,7 +295,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 });
             }else{
                 var temp = _.reject(xpath_arch_object[0].child_id[0].att_list, function(list) {
-                        return list instanceof Array? _.include(list, "position"): false
+                    return list instanceof Array? _.include(list, "position"): false;
                 });
                 expr_to_list = [_.flatten(temp)];
             }
@@ -878,8 +878,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             _.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) {
-                    if (res instanceof Array) return _.include(res, widget.name);
-                    else return false;
+                    return res instanceof Array? _.include(res, widget.name): false;
                 });
                 value = value instanceof Array ? value[1] : value;
                 self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr><td align="right">' + widget.string + ':</td>' + type_widget.render() + '</tr>');