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

[Mohammed Shekha(Open ERP)]

Hello,

Kanban View Probelm in One2many: Fixed the issue of kanban view, for one2many kanban view ids should not be sliced in do_show_more method, as one2many kanban uses Buffered Dataset, so ids should be as it is, so extended the KanbanGroup and overrided the do_show_more method.

Demo: Create records more than 40 for contact(res.partner), you will find Show More button at the end of one2many kanban view, but when you click on it nothin happens, it does not load next 40 records.

Thanks

Unmerged revisions

4029. By Mohammed Shekha(OpenERP)<email address hidden> on 2013-09-17

[FIX]Fixed the issue of kanban view, for one2many kanban view ids should not be sliced in do_show_more method, as one2many kanban uses Buffered Dataset, so ids should be as it is, so extended the KanbanGroup and overrided the do_show_more method.

=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js	2013-10-10 09:11:25 +0000
+++ addons/web/static/src/js/view_form.js	2013-10-25 12:30:51 +0000
@@ -4088,6 +4088,26 @@
     if (! instance.web_kanban || instance.web.form.One2ManyKanbanView)
         return;
     instance.web.form.One2ManyKanbanView = instance.web_kanban.KanbanView.extend({
+        init: function (parent, dataset, view_id, options) {
+            this._super.apply(this, arguments);
+            this.kanban_group = instance.web_kanban.One2ManyKanbanGroup;
+        }
+    });
+    instance.web_kanban.One2ManyKanbanGroup = instance.web_kanban.KanbanGroup.extend({
+        do_show_more: function() {
+            var self = this;
+            var ids = [];
+            return this.dataset.read_slice(this.view.fields_keys.concat(['__last_update']), {
+                'limit': self.view.limit,
+                'offset': self.dataset_offset += self.view.limit
+            }).then(function(records) {
+                self.view.dataset.ids = ids.concat(self.dataset.ids);
+                self.do_add_records(records);
+                self.compute_cards_auto_height();
+                self.view.postprocess_m2m_tags();
+                return records;
+            });
+        }
     });
 };
 

=== modified file 'addons/web_kanban/static/src/js/kanban.js'
--- addons/web_kanban/static/src/js/kanban.js	2013-04-30 09:48:43 +0000
+++ addons/web_kanban/static/src/js/kanban.js	2013-10-25 12:30:51 +0000
@@ -41,6 +41,7 @@
         this.has_been_loaded = $.Deferred();
         this.search_domain = this.search_context = this.search_group_by = null;
         this.currently_dragging = {};
+        this.kanban_group = instance.web_kanban.KanbanGroup;
         this.limit = options.limit || 40;
         this.add_group_mutex = new $.Mutex();
     },
@@ -216,7 +217,7 @@
                     length: 0,
                     aggregates: {},
                 };
-                var new_group = new instance.web_kanban.KanbanGroup(self, [], datagroup, dataset);
+                var new_group = new (self.kanban_group)(self, [], datagroup, dataset);
                 self.do_add_groups([new_group]).done(function() {
                     $(window).scrollTo(self.groups.slice(-1)[0].$el, { axis: 'x' });
                 });
@@ -267,7 +268,7 @@
                 }
                 return def.then(function(records) {
                         self.dataset.ids.push.apply(self.dataset.ids, dataset.ids);
-                        groups_array[index] = new instance.web_kanban.KanbanGroup(self, records, group, dataset);
+                        groups_array[index] = new (self.kanban_group)(self, records, group, dataset);
                         if (!remaining--) {
                             self.dataset.index = self.dataset.size() ? 0 : null;
                             return self.do_add_groups(groups_array);
@@ -283,7 +284,7 @@
             var def = $.Deferred();
             self.do_clear_groups();
             self.dataset.read_slice(self.fields_keys.concat(['__last_update']), { 'limit': self.limit }).done(function(records) {
-                var kgroup = new instance.web_kanban.KanbanGroup(self, records, null, self.dataset);
+                var kgroup = new (self.kanban_group)(self, records, null, self.dataset);
                 self.do_add_groups([kgroup]).done(function() {
                     if (_.isEmpty(records)) {
                         self.no_result();