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

[Vidhin Mehta (OpenERP)]

Unmerged revisions

3823. By Mahendra Barad(OpenERP) on 2013-10-10

[Merge] merge iwth trunk

3822. By RGA(OpenERP) on 2013-09-25

fix typo

3821. By RGA(OpenERP) on 2013-09-25

[IMP] dialog title and field label

3820. By RGA(OpenERP) on 2013-09-24

[IMP] add option to link kanban column

3819. By RGA(OpenERP) on 2013-09-19

Merge with trunk

3818. By Mahendra Barad(OpenERP) on 2013-09-09

[IMP]solve the kanban stage move problem

3817. By Mahendra Barad(OpenERP) on 2013-09-09

merge with trunk

3816. By RGA(OpenERP) on 2013-08-23

Merge with trunk

3815. By RGA(OpenERP) on 2013-08-21

Merge with trunk

3814. By RGA(OpenERP) on 2013-08-16

Merge with vme branch to pass context to model of stage object when edit from kanban view column

=== modified file 'addons/web_kanban/static/src/js/kanban.js'
--- addons/web_kanban/static/src/js/kanban.js	2013-09-06 10:11:55 +0000
+++ addons/web_kanban/static/src/js/kanban.js	2013-10-10 08:36:33 +0000
@@ -190,42 +190,102 @@
         this.dataset.index = null;
         this.do_switch_view('form');
     },
+    do_link_group: function(){
+        self = this;
+        self.dfm = new instance.web.form.DefaultFieldManager(self);
+        self.dfm.extend_field_desc({
+            stage: {
+                relation: self.group_by_field.relation,
+            },
+        });
+        self.stage_m2o = new instance.web.form.FieldMany2One(self.dfm, {
+            attrs: {
+                name: "stage",
+                type: "many2one",
+            },
+        });
+        self.stage_m2o.initialize_field = function(){
+            self.stage_m2o.is_started = true;
+            instance.web.form.ReinitializeFieldMixin.initialize_field.call(self.stage_m2o);
+        }
+        this.stage_dialog = new instance.web.Dialog(this, {
+            title: _t("Select an existing column"),
+            width: 450,
+            buttons: [
+                {text: _t("OK"), click: function() { 
+                    var stage_id = self.stage_m2o.get_value();
+                    if(!stage_id){
+                        self.do_warn(_t("Kanban View"), _t("Select stage from available column (Stage)"));
+                    }else {
+                        var context = self.dataset.context;
+                        var model = context.active_model;
+                        var id = context.active_id;
+                        var stage_field = context.stage_m2m_field
+                        var data = {};
+                        data[stage_field] = [[4, stage_id, false]];
+                        (new instance.web.DataSet(self, model))
+                        .write(id, data, context)
+                        .done (function(){
+                            self.stage_dialog.close();
+                            self.do_reload();
+                         })
+                        .fail(function(error, evt) {
+                             evt.preventDefault();
+                             alert(_t("An error has occured while add a new group column:\n") + error.data.message);
+                             self.stage_dialog.close();  
+                             self.do_reload();
+                         });
+                    }
+                }},
+                {text: _t("Close"), click: function() { self.stage_dialog.close();}}
+            ]
+        }, QWeb.render('KanbanView.dialog.table')).open();
+        $label = $('<label for="oe-field-input-11" class="oe_form_label oe_align_right">Available Column (Stage)</label>')
+        $label.appendTo(this.stage_dialog.$el.find('td:first'));
+        self.stage_m2o.appendTo(this.stage_dialog.$el.find('td:last'));
+    },
     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,
-            }
-        });
-        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' });
+        if (self.dataset.context.stage_m2m_field){
+            self.do_link_group();
+        }else{
+            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,
+                }
+            });
+            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();
+                    // If same group name found than don't show new column.
+                    if(_.include(_.pluck(self.groups,'title'),new_record[0][1])) return;
+                    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' });
+                    });
                 });
-            });
-        });
+            });        
+        }
     },
     do_search: function(domain, context, group_by) {
         var self = this;
@@ -395,8 +455,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];
@@ -747,6 +807,7 @@
             views: [[false, 'form']],
             type: 'ir.actions.act_window',
             target: "new",
+            context: self.dataset.get_context(),
             flags: {
                 action_buttons: true,
             }
@@ -762,7 +823,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();
             });
         }

=== modified file 'addons/web_kanban/static/src/xml/web_kanban.xml'
--- addons/web_kanban/static/src/xml/web_kanban.xml	2013-03-20 13:09:31 +0000
+++ addons/web_kanban/static/src/xml/web_kanban.xml	2013-10-10 08:36:33 +0000
@@ -45,7 +45,7 @@
                         <li><a data-action="toggle_fold" href="#">Fold</a></li>
                         <t t-if="widget.view.grouped_by_m2o and widget.value">
                             <li><a data-action="edit" href="#">Edit</a></li>
-                            <li><a data-action="delete" href="#">Delete</a></li>
+                            <li><a data-action="delete" href="#">Remove</a></li>
                         </t>
                     </ul>
                 </div>
@@ -108,4 +108,16 @@
         </div>
     </div>
 </t>
+<t t-name="KanbanView.dialog.table">
+    <div class='oe_form'>
+        <table>
+            <tbody>
+                <tr class='oe_form_group_row'>
+                    <td class='oe_form_group_cell oe_form_group_cell_label' colspan='1' width='1%'></td>
+                    <td class='oe_form_group_cell' colspan='1' width='99%'></td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
+</t>
 </template>