Merge lp:~openerp-dev/openerp-web/6.1-opw-574625-bth into lp:openerp-web/6.1

[Bhumi Thakkar (Open ERP)]

Hello,

Using browser's back button to navigate back to a opportunities screen in graph or list view results in error.

1. Go to Sales => Opportunities,
2. Open in Graph View or List View.
3. Select any other menu
4. Click on the browser's back button.

Observed: Error is coming in dialog box: "Cannot read property 'view_id' of undefined"
Extected: "Open in Graph View or List View"

put condition if fields_view do not get from controller then return false;
if fields_view get then view_id get from fields_view.

Thanks.

[Xavier (Open ERP) (xmo-deactivatedaccount)]

1. This is not the place at which the code blows up.
2. This is not a fix, it just bails out on an earlier piece of code's error, why is `fields_view` undefined at this point?

review: Disapprove

[lp:~openerp-dev/openerp-web/6.1-opw-574625-bth]

2361. By Bhumi Thakkar (Open ERP) on 2012-06-25

[FIX] set value of fields_view when view is loaded.

[Bhumi Thakkar (Open ERP) (bth-openerp)]

> 1. This is not the place at which the code blows up.
> 2. This is not a fix, it just bails out on an earlier piece of code's error,
> why is `fields_view` undefined at this point?

I have modified code to set value of fields_view.set value of fields_view when view is loaded.

review: Needs Resubmitting

Unmerged revisions

2361. By Bhumi Thakkar (Open ERP) on 2012-06-25

[FIX] set value of fields_view when view is loaded.

2360. By Bhumi Thakkar (Open ERP) on 2012-06-13

[FIX] Put condition before using object.

=== modified file 'addons/web/static/src/js/views.js'
--- addons/web/static/src/js/views.js	2012-06-12 14:19:43 +0000
+++ addons/web/static/src/js/views.js	2012-06-25 10:52:19 +0000
@@ -661,7 +661,7 @@
             self.shortcut_check(self.views[view_type]);
 
             self.$element.find('.oe-view-manager-logs:first').addClass('oe-folded').removeClass('oe-has-more').css('display','none').find('ul').empty();
-
+            if(!self.views[self.active_view].controller.fields_view) return false;
             var controller = self.views[self.active_view].controller,
                 fvg = controller.fields_view,
                 view_id = (fvg && fvg.view_id) || '--';
@@ -699,7 +699,7 @@
                     return self.on_mode_switch(state.view_type, true);
                 })
             );
-        } 
+        }
 
         $.when(defs).then(function() {
             self.views[self.active_view].controller.do_load_state(state, warm);
@@ -1200,7 +1200,7 @@
      *
      * @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

=== modified file 'addons/web_graph/static/src/js/graph.js'
--- addons/web_graph/static/src/js/graph.js	2012-06-08 12:36:39 +0000
+++ addons/web_graph/static/src/js/graph.js	2012-06-25 10:52:19 +0000
@@ -40,8 +40,8 @@
         this._super();
     },
     start: function() {
+        this._super();
         var self = this;
-        this._super();
         var loaded;
         if (this.embedded_view) {
             loaded = $.when([self.embedded_view]);
@@ -50,6 +50,8 @@
                     model: this.dataset.model,
                     view_id: this.view_id,
                     view_type: 'graph'
+            },function(res){
+                self.fields_view = res;
             });
         }
         return $.when(
@@ -57,7 +59,6 @@
             loaded)
             .then(function (fields_result, view_result) {
                 self.fields = fields_result[0];
-                self.fields_view = view_result[0];
                 self.on_loaded(self.fields_view);
             });
     },