Merge lp:~openerp-dev/openerp-web/7.0-opw-601800-msh into lp:openerp-web/7.0

[Mohammed Shekha(Open ERP)]

Hello,

Fixed the issue of dialog open even if osv.exception raised through view_init, dialog should be opened only when either view_loaded(resolved once view is successfully loaded) or if its a form view then after is_initialized is resolved(resolved after default_get result).

Demo:- Warehouse -> Delivery Orders -> Open any delivery order -> Confirm It and then just click Return Product button and return the product -> again go back to same delivery order -> return Product button is still available -> Click on it, osv exception is raised (that you can return only those product which is in done state) but with exception dialog is also opened in background of exception dialog.

View Dialog must be opened after successful loading of View and successful loading of default_get result(if it is a form view).

Thanks.

Unmerged revisions

4095. By Mohammed Shekha(OpenERP)<email address hidden> on 2013-12-18

[FIX]Web: Fixed the issue of dialog open even if osv.exception raised through view_init, dialog should be opened only when either view_loaded(resolved once view is successfully loaded) or if its a form view then after is_initialized is resolved(resolved after default_get result).

=== modified file 'addons/web/static/src/js/views.js'
--- addons/web/static/src/js/views.js	2013-06-21 12:44:49 +0000
+++ addons/web/static/src/js/views.js	2013-12-20 04:55:12 +0000
@@ -364,6 +364,7 @@
      * @return {*}
      */
     ir_actions_common: function(executor, options) {
+        var self = this;
         if (this.inner_widget && executor.action.target !== 'new') {
             if (this.getParent().has_uncommitted_changes()) {
                 return $.Deferred().reject();
@@ -391,7 +392,16 @@
             this.dialog_widget = widget;
             this.dialog_widget.setParent(this.dialog);
             var initialized = this.dialog_widget.appendTo(this.dialog.$el);
-            this.dialog.open();
+            var controller = this.dialog_widget.views[this.dialog_widget.active_view].controller;
+            if (this.dialog_widget.active_view == 'form') {
+                controller.is_initialized.done(function (){
+                    self.dialog.open();
+                });
+            } else {
+                controller.on('view_loaded', this, function(){
+                    self.dialog.open();
+                });
+            }
             return initialized;
         } else  {
             this.dialog_stop();