Merge lp:~openerp-dev/openerp-web/trunk-kanban-column-avo into lp:openerp-web

[Amit Vora(OpenERP)]

Hello,

I have fixed issue in project kanban view drag and drop the "Undefined" column somewhere => you will see all existing *projects* appear in the column.
Thanks
avo

[lp:~openerp-dev/openerp-web/trunk-kanban-column-avo]

3911. By Amit Vora(OpenERP) on 2014-04-28

[MRG] merge with main branch

3912. By Amit Vora(OpenERP) on 2014-05-16

[MRG] merge with main barcnh

Unmerged revisions

3912. By Amit Vora(OpenERP) on 2014-05-16

[MRG] merge with main barcnh

3911. By Amit Vora(OpenERP) on 2014-04-28

[MRG] merge with main branch

3910. By Amit Vora(OpenERP) on 2014-04-02

[MERGE] merge with main branch

3909. By Chirag Dodiya(OpenERP) on 2014-03-18

[MRG]Merge with lp:openerp-web

3908. By Mahendra Barad(OpenERP) on 2014-03-11

[REV]unwanted changes

3907. By Mahendra Barad(OpenERP) on 2014-03-11

[Merge]with trunk

3906. By Mahendra Barad(OpenERP) on 2014-03-04

[IMP]pass context in resequence

3905. By Mahendra Barad(OpenERP) on 2014-03-04

[Merge]with trunk

3904. By Vidhin Mehta (OpenERP) on 2014-02-14

[MERGE]remove unwanted changes.

3903. By Vidhin Mehta (OpenERP) on 2014-02-14

[MREGE]Trunk.

=== modified file 'addons/web/controllers/main.py'
--- addons/web/controllers/main.py	2014-05-06 16:34:22 +0000
+++ addons/web/controllers/main.py	2014-05-16 10:12:13 +0000
@@ -1076,7 +1076,7 @@
             return False
         # python 2.6 has no start parameter
         for i, id in enumerate(ids):
-            m.write(id, { field: i + offset })
+            m.write(id, { field: i + offset }, request.context)
         return True
 
 class View(http.Controller):

=== modified file 'addons/web_kanban/static/src/js/kanban.js'
--- addons/web_kanban/static/src/js/kanban.js	2014-05-12 08:10:32 +0000
+++ addons/web_kanban/static/src/js/kanban.js	2014-05-16 10:12:13 +0000
@@ -208,22 +208,9 @@
         form.on("on_button_cancel", am.dialog, function() { return am.dialog.$dialog_box.modal('hide'); });
         form.on('record_created', self, function(r) {
             (new instance.web.DataSet(self, self.group_by_field.relation)).name_get([r]).done(function(new_record) {
+                am.dialog.close();
+                self.do_reload();
                 am.dialog.$dialog_box.modal('hide');
-                var domain = self.dataset.domain.slice(0);
-                domain.push([self.group_by, '=', new_record[0][0]]);
-                var dataset = new instance.web.DataSetSearch(self, self.dataset.model, self.dataset.get_context(), domain);
-                var datagroup = {
-                    get: function(key) {
-                        return this[key];
-                    },
-                    value: new_record[0],
-                    length: 0,
-                    aggregates: {},
-                };
-                var new_group = new instance.web_kanban.KanbanGroup(self, [], datagroup, dataset);
-                self.do_add_groups([new_group]).done(function() {
-                    $(window).scrollTo(self.groups.slice(-1)[0].$el, { axis: 'x' });
-                });
             });
         });
     },
@@ -417,14 +404,14 @@
                     stop: function(event, ui) {
                         var stop_index = ui.item.index();
                         if (start_index !== stop_index) {
-                            var $start_column = $('.oe_kanban_groups_records .oe_kanban_column').eq(start_index);
-                            var $stop_column = $('.oe_kanban_groups_records .oe_kanban_column').eq(stop_index);
+                            var $start_column = self.$('.oe_kanban_groups_records .oe_kanban_column').eq(start_index);
+                            var $stop_column = self.$('.oe_kanban_groups_records .oe_kanban_column').eq(stop_index);
                             var method = (start_index > stop_index) ? 'insertBefore' : 'insertAfter';
                             $start_column[method]($stop_column);
                             var tmp_group = self.groups.splice(start_index, 1)[0];
                             self.groups.splice(stop_index, 0, tmp_group);
                             var new_sequence = _.pluck(self.groups, 'value');
-                            (new instance.web.DataSet(self, self.group_by_field.relation)).resequence(new_sequence).done(function(r) {
+                            (new instance.web.DataSet(self, self.group_by_field.relation, self.dataset.get_context())).resequence(new_sequence).done(function(r) {
                                 if (r === false) {
                                     console.error("Kanban: could not resequence model '%s'. Probably no 'sequence' field.", self.group_by_field.relation);
                                 }
@@ -773,6 +760,7 @@
             views: [[false, 'form']],
             type: 'ir.actions.act_window',
             target: "new",
+            context: self.dataset.get_context(),
             flags: {
                 action_buttons: true,
             }
@@ -788,7 +776,7 @@
     do_action_delete: function() {
         var self = this;
         if (confirm(_t("Are you sure to remove this column ?"))) {
-            (new instance.web.DataSet(self, self.view.group_by_field.relation)).unlink([self.value]).done(function(r) {
+            (new instance.web.DataSet(self, self.view.group_by_field.relation, self.dataset.get_context())).unlink([self.value]).done(function(r) {
                 self.view.do_reload();
             });
         }