[FIX] Only set table-row for kanban view (for drag and drop), Else the switch between eg view Calendar and view form (without pass by another view (on IE)) does not work properly.

lp bug: https://launchpad.net/bugs/1294059 fixed
lp bug: https://launchpad.net/bugs/1097219 fixed

bzr revid: jke@openerp.com-20140318165622-kb4j5zz899lciz8v
This commit is contained in:
Kersten Jeremy 2014-03-18 17:56:22 +01:00
parent cac0c9600a
commit e50b3bf7ff
3 changed files with 7 additions and 3 deletions

View File

@ -1248,12 +1248,14 @@
width: 100%;
}
.openerp .oe_view_manager .oe_view_manager_body {
display: table-row;
height: inherit;
}
.openerp .oe_view_manager .oe_view_manager_view_kanban:not(:empty) {
height: inherit;
}
.openerp .oe_view_manager[data-view-type=kanban] .oe_view_manager_body {
display: table-row;
}
.openerp .oe_view_manager table.oe_view_manager_header {
border-collapse: separate;
width: 100%;

View File

@ -1037,10 +1037,12 @@ $sheet-padding: 16px
height: inherit
width: 100%
.oe_view_manager_body
display: table-row
height: inherit
.oe_view_manager_view_kanban:not(:empty)
height: inherit
&[data-view-type=kanban]
.oe_view_manager_body
display: table-row
table.oe_view_manager_header
border-collapse: separate

View File

@ -644,7 +644,7 @@ instance.web.ViewManager = instance.web.Widget.extend({
this.$el
.find('.oe_view_manager_switch a').filter('[data-view-type="' + view_type + '"]')
.parent().addClass('active');
this.$el.attr("data-view-type", view_type);
return $.when(view_promise).done(function () {
_.each(_.keys(self.views), function(view_name) {
var controller = self.views[view_name].controller;