Merge lp:~openerp-dev/openerp-web/trunk-bug-869746-vda into lp:openerp-web

[Vaibhav Darji]

Type cast for Action button.
columns contain field action `id|name` as a string but as an Integer on field data attributes.
And At last when do_execute_action performs action, parse action.name.

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

Far's I can tell, merge proposal 76560 to fix bug 851866 has a simpler fix for the same problem. So I'll go with that one.

review: Disapprove

Unmerged revisions

1184. By Vaibhav Darji on 2011-10-08

[FIX] type cast for Action button.When we render node,contains action id,name as a string.

=== modified file 'addons/web/static/src/js/view_list.js'
--- addons/web/static/src/js/view_list.js	2011-10-07 07:17:56 +0000
+++ addons/web/static/src/js/view_list.js	2011-10-08 08:21:25 +0000
@@ -712,7 +712,11 @@
         this.columns = opts.columns;
         this.dataset = opts.dataset;
         this.records = opts.records;
-
+        
+        this.visible_columns = _.filter(this.columns, function (column) {
+            return column.invisible !== '1';
+        });
+        
         this.record_callbacks = {
             'remove': function (event, record) {
                 var $row = self.$current.find(
@@ -765,8 +769,11 @@
                 var $target = $(e.currentTarget),
                       field = $target.closest('td').data('field'),
                        $row = $target.closest('tr'),
-                  record_id = self.row_id($row);
-
+                       field_action = self.visible_columns[$target.closest('td').index()],
+                    record_id = self.row_id($row);
+                    
+                if(field_action.type == 'action') field = field.toString();
+                
                 $(self).trigger('action', [field, record_id, function () {
                     return self.reload_record(self.records.get(record_id));
                 }]);