From e50b3bf7fffd61a632f757970bd23f28417d4bd3 Mon Sep 17 00:00:00 2001
From: Kersten Jeremy <jke@openerp.com>
Date: Tue, 18 Mar 2014 17:56:22 +0100
Subject: [PATCH] [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
---
 addons/web/static/src/css/base.css  | 4 +++-
 addons/web/static/src/css/base.sass | 4 +++-
 addons/web/static/src/js/views.js   | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 6a20442ed41..8c2da02d969 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -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%;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 38a47eed1c5..b18e4fc65d8 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -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
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 23390df4bb4..5f85b581cea 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -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;