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

[Bhumi Thakkar (Open ERP)]

Hello,

     In My Timesheet, On Refresh go error.

1. Human Resource => Time Tracking => My Timesheet.
2. Refresh or press F5

Observed: 'Error is coming TypeError: fvg.arch is undefined'
Expected: 'On refresh page should be reload again without error.'

My Timesheet is server action.In server action to perform action action id is not passed in action so action is extended for id and in listview this.fields_view = {} is not initialized in init method so error is coming 'Error: QWeb2 - template['ViewManagerDebug']: Runtime Error: TypeError: dict.view.fields_view is undefined' after initialized it is resolved.

Thanks.

[Jiten (OpenERP) (jiten-openerp)]

Hello,

I have tested as your description but i am not able to reproduce this error.

And no need to merge this proposal for further.

So, i am rejecting this branch.

But, thanks for your contribution.

review: Disapprove

Unmerged revisions

2416. By Bhumi Thakkar (Open ERP) on 2012-07-26

[FIX] in Server action,action is extended by id.

=== modified file 'addons/web/static/src/js/view_list.js'
--- addons/web/static/src/js/view_list.js	2012-06-25 07:20:46 +0000
+++ addons/web/static/src/js/view_list.js	2012-07-26 06:51:26 +0000
@@ -57,6 +57,7 @@
         this.previous_colspan = null;
         this.colors = null;
 
+        this.fields_view = {};
         this.columns = [];
 
         this.records = new Collection();

=== modified file 'addons/web/static/src/js/views.js'
--- addons/web/static/src/js/views.js	2012-06-29 10:53:25 +0000
+++ addons/web/static/src/js/views.js	2012-07-26 06:51:26 +0000
@@ -173,8 +173,11 @@
         this.rpc('/web/action/run', {
             action_id: action.id,
             context: action.context || {}
-        }).then(function (action) {
-            self.do_action(action, on_closed)
+        }).then(function (act) {
+            act = _.extend({
+                id : action.id
+            }, act || {});
+            self.do_action(act, on_closed)
         });
     },
     ir_actions_client: function (action) {