[MERGE] merge from trunk

bzr revid: ged@openerp.com-20140225091310-pzkj5ip17esl52kz

1 files changed, 22 insertions, 20 deletions

diff --git a/addons/web_graph/static/src/js/graph_widget.js b/addons/web_graph/static/src/js/graph_widget.js
index 51baabaff5e..9e4c81157d1 100644
--- a/addons/web_graph/static/src/js/graph_widget.js
+++ b/addons/web_graph/static/src/js/graph_widget.js
@@ -263,9 +263,6 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({
             case 'swap_axis':
                 this.swap_axis();
                 break;
-            case 'expand_all':
-                this.pivot.expand_all().then(this.proxy('display_data'));
-                break;
             case 'update_values':
                 this.pivot.update_data().then(this.proxy('display_data'));
                 break;
@@ -295,25 +292,30 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({
 
         if (header.expanded) {
             this.fold(header);
-        } else {
-            if (header.path.length < header.root.groupby.length) {
-                this.expand(id);
-            } else {
-                if (!this.important_fields.length) {
-                    return;
-                }
+            return;
+        } 
+        if (header.path.length < header.root.groupby.length) {
+            this.expand(id);
+            return;
+        } 
+        if (!this.important_fields.length) {
+            return;
+        }
 
-                var fields = _.map(this.important_fields, function (field) {
-                        return {id: field.field, value: field.string, type:self.fields[field.field.split(':')[0]].type};
-                });
-                this.dropdown = $(QWeb.render('field_selection', {fields:fields, header_id:id}));
-                $(event.target).after(this.dropdown);
-                this.dropdown.css({position:'absolute',
-                                   left:event.pageX,
-                                   top:event.pageY});
-                this.$('.field-selection').next('.dropdown-menu').toggle();
-            }
+        var fields = _.map(this.important_fields, function (field) {
+                return {id: field.field, value: field.string, type:self.fields[field.field.split(':')[0]].type};
+        });
+        if (this.dropdown) {
+            this.dropdown.remove();
         }
+        this.dropdown = $(QWeb.render('field_selection', {fields:fields, header_id:id}));
+        $(event.target).after(this.dropdown);
+        this.dropdown.css({position:'absolute',
+                           left:event.pageX,
+                           top:event.pageY});
+        this.$('.field-selection').next('.dropdown-menu').toggle();
+        
+        
     },
 
     field_selection: function (event) {