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

[Vidhin Mehta (OpenERP)]

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

3866. By Vidhin Mehta (OpenERP) on 2013-11-13

[REM]remove unwanted code.

3867. By Vidhin Mehta (OpenERP) on 2013-11-19

[MERGE]Trunk.

3868. By Vidhin Mehta (OpenERP) on 2013-11-22

[FIX]

3869. By Vidhin Mehta (OpenERP) on 2013-11-25

[Merge]Trunk.

3870. By Vidhin Mehta (OpenERP) on 2013-11-25

[IMP]Refactore code.

3871. By Vidhin Mehta (OpenERP) on 2013-11-25

[IMP]typo change

3872. By Vidhin Mehta (OpenERP) on 2013-11-26

[IMP]old code remerged.

3873. By Vidhin Mehta (OpenERP) on 2013-11-26

[IMP]something

3874. By Mahendra Barad(OpenERP) on 2013-11-26

[IMP]added the current model in context

3875. By Vidhin Mehta (OpenERP) on 2013-11-26

[IMP]

3876. By Mahendra Barad(OpenERP) on 2013-11-27

[REV]revert changes

Unmerged revisions

3876. By Mahendra Barad(OpenERP) on 2013-11-27

[REV]revert changes

3875. By Vidhin Mehta (OpenERP) on 2013-11-26

[IMP]

3874. By Mahendra Barad(OpenERP) on 2013-11-26

[IMP]added the current model in context

3873. By Vidhin Mehta (OpenERP) on 2013-11-26

[IMP]something

3872. By Vidhin Mehta (OpenERP) on 2013-11-26

[IMP]old code remerged.

3871. By Vidhin Mehta (OpenERP) on 2013-11-25

[IMP]typo change

3870. By Vidhin Mehta (OpenERP) on 2013-11-25

[IMP]Refactore code.

3869. By Vidhin Mehta (OpenERP) on 2013-11-25

[Merge]Trunk.

3868. By Vidhin Mehta (OpenERP) on 2013-11-22

[FIX]

3867. By Vidhin Mehta (OpenERP) on 2013-11-19

[MERGE]Trunk.

=== modified file 'addons/web/static/src/js/views.js'
--- addons/web/static/src/js/views.js	2013-11-25 16:05:06 +0000
+++ addons/web/static/src/js/views.js	2013-11-27 10:06:00 +0000
@@ -1415,6 +1415,7 @@
             } else {
                 self.do_action({"type":"ir.actions.act_window_close"});
                 return result_handler();
+                
             }
         };
 

=== modified file 'addons/web_kanban/static/src/js/kanban.js'
--- addons/web_kanban/static/src/js/kanban.js	2013-10-30 18:09:41 +0000
+++ addons/web_kanban/static/src/js/kanban.js	2013-11-27 10:06:00 +0000
@@ -190,41 +190,39 @@
         this.dataset.index = null;
         this.do_switch_view('form');
     },
+    get_action: function(){
+        var self = this;
+        var stage_management = this.fields_view.arch.attrs['stage_management'];
+        var action = {
+                    name: _t("Add New Column"),
+                    res_model: this.group_by_field.relation,
+                    views: [[false, 'form']],
+                    type: 'ir.actions.act_window',
+                    target: "new",
+                    context: self.dataset.get_context(),
+                    flags: {
+                        action_buttons: true,
+                    }
+            };
+        var stage_option = this.fields_view.arch.attrs['stage_options'];
+        if(!stage_option)return action;
+        stage_option = instance.web.py_eval(stage_option);
+        var context =  (this.dataset.get_context()).eval();
+        if (stage_option['group_by'] === this.group_by && stage_management && context[stage_option['default_context_key']]){
+            action.context = (new openerp.web.CompoundContext(context)).add({'default_action':'create'});
+            action.res_model = stage_management;
+        }
+        return action
+    },
     do_add_group: function() {
         var self = this;
-        self.do_action({
-            name: _t("Add column"),
-            res_model: self.group_by_field.relation,
-            views: [[false, 'form']],
-            type: 'ir.actions.act_window',
-            target: "new",
-            context: self.dataset.get_context(),
-            flags: {
-                action_buttons: true,
-            }
-        });
+        self.do_action(this.get_action());
         var am = instance.webclient.action_manager;
         var form = am.dialog_widget.views.form.controller;
         form.on("on_button_cancel", am.dialog, am.dialog.close);
         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();
-                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' });
-                });
-            });
+            am.dialog.close();
+            self.do_reload();
         });
     },
     do_search: function(domain, context, group_by) {
@@ -399,8 +397,8 @@
                     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];
@@ -742,34 +740,65 @@
     do_action_toggle_fold: function() {
         this.do_toggle_fold();
     },
+    get_action: function(){
+        var self = this;
+        var parent_widget = self.getParent();
+        var stage_management = parent_widget.fields_view.arch.attrs['stage_management'];
+        var action = {
+                    name: _t("Edit Column"),
+                    res_id: this.value,
+                    res_model: this.view.group_by_field.relation,
+                    views: [[false, 'form']],
+                    type: 'ir.actions.act_window',
+                    target: "new",
+                    context: this.dataset.context,
+                    flags: {
+                        action_buttons: true,
+                    }
+                }
+        var stage_option = parent_widget.fields_view.arch.attrs['stage_options'];
+        if(!stage_option)return action;
+        stage_option = instance.web.py_eval(stage_option);
+        var context =  (this.dataset.get_context()).eval();
+        if (stage_option['group_by'] === this.view.group_by && stage_management && context[stage_option['default_context_key']]){
+            action.context = (new openerp.web.CompoundContext(context)).add({'current_model':this.dataset.model, active_id:this.value, 'default_action':'write'});
+            action.res_model = stage_management;
+            delete action['res_id'];
+        }
+        return action
+    },
     do_action_edit: function() {
         var self = this;
-        self.do_action({
-            res_id: this.value,
-            name: _t("Edit column"),
-            res_model: self.view.group_by_field.relation,
-            views: [[false, 'form']],
-            type: 'ir.actions.act_window',
-            target: "new",
-            flags: {
-                action_buttons: true,
-            }
-        });
+        self.do_action(this.get_action());
         var am = instance.webclient.action_manager;
         var form = am.dialog_widget.views.form.controller;
         form.on("on_button_cancel", am.dialog, am.dialog.close);
-        form.on('record_saved', self, function() {
+        form.on('record_saved record_created', self, function() {
             am.dialog.close();
             self.view.do_reload();
         });
     },
     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) {
-                self.view.do_reload();
-            });
-        }
+        var func = function(){
+            if (confirm(_t("Are you sure to remove this column ?"))) {
+                (new instance.web.DataSet(self, res_model, context)).unlink([self.value]).done(function(r) {
+                    self.view.do_reload();
+                });
+            }
+        }
+        var res_model = self.view.group_by_field.relation;
+        var parent_widget = self.getParent();
+        var stage_management = parent_widget.fields_view.arch.attrs['stage_management'];
+        var stage_option = parent_widget.fields_view.arch.attrs['stage_options'];
+        if(!stage_option)return func();
+        stage_option = instance.web.py_eval(stage_option);
+        var context =  (this.dataset.get_context()).eval();
+        if (stage_option['group_by'] === this.view.group_by && stage_management && context[stage_option['default_context_key']]){
+            res_model = stage_management;
+            context = (new openerp.web.CompoundContext(context)).add({'current_model': this.dataset.model});
+        }
+        return func();
     },
     do_save_sequences: function() {
         var self = this;