diff options
| author | Vidhin Mehta <vme@tinyerp.com> | 2013-05-17 11:11:10 +0530 |
|---|---|---|
| committer | Vidhin Mehta <vme@tinyerp.com> | 2013-05-17 11:11:10 +0530 |
| commit | b7b337eff7c7ac98eb3f216ee271bfe3c27ae215 (patch) | |
| tree | 1c00edf44509dc7c9c8e90b54be01f1dddfca538 /addons/web_graph/static/src | |
| parent | 2b0343aa309959fdf8f7596ff00c6b1f846741f5 (diff) | |
| parent | 389f4911147b7cf5191b93e025c7b5c39d9e9eb6 (diff) | |
[MERGE]merge with trunk.
bzr revid: vme@tinyerp.com-20130517054110-vej1co0gtacht4x4
Diffstat (limited to 'addons/web_graph/static/src')
| -rw-r--r-- | addons/web_graph/static/src/css/graph.css | 4 | ||||
| -rw-r--r-- | addons/web_graph/static/src/js/graph.js | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/addons/web_graph/static/src/css/graph.css b/addons/web_graph/static/src/css/graph.css index a9fff591e39..2fd4b5953cf 100644 --- a/addons/web_graph/static/src/css/graph.css +++ b/addons/web_graph/static/src/css/graph.css @@ -1,5 +1,5 @@ .openerp a.dropdown-menu-icon { - z-index: 10; + z-index: 1; position: absolute; color: #4c4c4c; right: 8px; @@ -23,7 +23,7 @@ padding: 8px; border: 1px solid #afafb6; background: white; - z-index: 900; + z-index: 1; min-width: 160px; overflow-x: hidden; -moz-border-radius: 3px; diff --git a/addons/web_graph/static/src/js/graph.js b/addons/web_graph/static/src/js/graph.js index 35ad0aaaea8..8710b840209 100644 --- a/addons/web_graph/static/src/js/graph.js +++ b/addons/web_graph/static/src/js/graph.js @@ -246,7 +246,7 @@ instance.web_graph.GraphView = instance.web.View.extend({ var result = []; var ticks = {}; - return obj.call("fields_view_get", [view_id, 'graph']).then(function(tmp) { + return this.alive(obj.call("fields_view_get", [view_id, 'graph', context]).then(function(tmp) { view_get = tmp; fields = view_get['fields']; var toload = _.select(group_by, function(x) { return fields[x] === undefined }); @@ -368,7 +368,7 @@ instance.web_graph.GraphView = instance.web.View.extend({ 'ticks': _.map(ticks, function(el, key) { return [el, key] }) }; return res; - }); + })); }, // Render the graph and update menu styles |