diff options
| author | Géry Debongnie <ged@odoo.com> | 2015-01-30 15:14:33 +0100 |
|---|---|---|
| committer | Géry Debongnie <ged@odoo.com> | 2015-01-30 15:14:33 +0100 |
| commit | 7dfceb8f7e141ca489be9f95687747b75aa111f9 (patch) | |
| tree | 88a3d4ea5af8bde06824836086fdcb926bf83fc1 /addons/web/static/src | |
| parent | aad2a3cca97d07d961e112eaf12d47212694c4cc (diff) | |
[FIX] web: unbreak tree view
The do_show and do_hide methods did not call their _super, which is bad.
Also, add an icon for the poor treeview.
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/css/base.css | 5 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/view_tree.js | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index fe219c01b59..4b2ff673f29 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -528,7 +528,7 @@ background-image: -webkit-radial-gradient(circle, #eee 0%, #ccc 40%, #bbb 100%); background-image: -moz-radial-gradient(#eee 0%, #ccc 40%, #bbb 100%); background-image: -ms-radial-gradient(#eee 0%, #ccc 40%, #bbb 100%); - background-image: radial-gradient(circle, #eeeeee 0%, #cccccc 40%, #bbbbbb 100%); + background-image: radial-gradient(circle, #eee 0%, #ccc 40%, #bbb 100%); } .openerp .oe_kanban_status_green { background: green; @@ -1048,6 +1048,9 @@ .openerp .oe-view-manager-header .oe-view-manager-switch .oe-vm-switch-pivot:before { content: ""; } +.openerp .oe-view-manager-header .oe-view-manager-switch .oe-vm-switch-tree:before { + content: ""; +} .openerp .oe-view-manager-header .oe-view-manager-buttons { display: inline-block; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 06200f9cf98..12741d7675c 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -897,6 +897,8 @@ $sheet-padding: 16px content: "\f0ae" .oe-vm-switch-pivot:before content: "\f0ce" + .oe-vm-switch-tree:before + content: "\f036" .oe-view-manager-buttons display: inline-block > div diff --git a/addons/web/static/src/js/view_tree.js b/addons/web/static/src/js/view_tree.js index 06e19e28ca9..aac7198f2c3 100644 --- a/addons/web/static/src/js/view_tree.js +++ b/addons/web/static/src/js/view_tree.js @@ -258,11 +258,13 @@ instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeVie do_show: function () { this.$el.show(); + this._super(); }, do_hide: function () { this.$el.hide(); this.hidden = true; + this._super(); } }); })(); |