[MERGE] trunk

bzr revid: al@openerp.com-20111214172434-u2i6im40bviq229q

1 files changed, 13 insertions, 5 deletions

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index af0f0f47aba..e2bca4cc674 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -158,6 +158,7 @@ session.web.ActionManager = session.web.Widget.extend({
     },
     ir_actions_client: function (action) {
         this.content_stop();
+        this.dialog_stop();
         var ClientWidget = session.web.client_actions.get_object(action.tag);
         (this.client_widget = new ClientWidget(this, action.params)).appendTo(this);
     },
@@ -1064,19 +1065,26 @@ session.web.View = session.web.Widget.extend(/** @lends session.web.View# */{
         this.embedded_view = embedded_view;
         this.options.sidebar = false;
     },
+    do_show: function () {
+        this.$element.show();
+    },
+    do_hide: function () {
+        this.$element.hide();
+    },
     /**
      * Switches to a specific view type
      *
      * @param {String} view view type to switch to
      */
-    do_switch_view: function(view) { },
+    do_switch_view: function(view) { 
+    },
     /**
      * Cancels the switch to the current view, switches to the previous one
      */
-    do_prev_view: function () { },
+    do_prev_view: function () { 
+    },
     do_search: function(view) {
     },
-
     set_common_sidebar_sections: function(sidebar) {
         sidebar.add_default_sections();
     },
@@ -1145,13 +1153,13 @@ session.web.View = session.web.Widget.extend(/** @lends session.web.View# */{
     sidebar_context: function () {
         return $.Deferred().resolve({}).promise();
     },
-
     do_push_state: function(state) {
         if (this.wiget_parent && this.widget_parent.do_push_state) {
             this.widget_parent.do_push_state(state);
         }
     },
-
+    do_load_state: function(state) {
+    }
 });
 
 session.web.json_node_to_xml = function(node, human_readable, indent) {