Merge lp:~openerp-dev/openerp-web/trunk-kanban_column_edition-jap into lp:openerp-web

[Jagdish Panchal (Open ERP)]

Hello,

I have improve code for column kanban edition as per specification.

Thanks
JAP

[lp:~openerp-dev/openerp-web/trunk-kanban_column_edition-jap]

3700. By Jagdish Panchal (Open ERP) on 2013-03-25

[MERGE] merge with main branch

3701. By Jagdish Panchal (Open ERP) on 2013-03-28

[MERGE] Merge with main branch

3702. By Jagdish Panchal (Open ERP) on 2013-04-15

[MERGE] Merge with main branch

3703. By Jagdish Panchal (Open ERP) on 2013-04-17

[MERGE] Merge with main branch

3704. By Jignesh Rathod(OpenERP) on 2013-05-27

[MERGE] Trunk web.

3705. By Amit Bhavsar (Open ERP) on 2013-06-03

[MERGE] merge with latest trunk

Unmerged revisions

3705. By Amit Bhavsar (Open ERP) on 2013-06-03

[MERGE] merge with latest trunk

3704. By Jignesh Rathod(OpenERP) on 2013-05-27

[MERGE] Trunk web.

3703. By Jagdish Panchal (Open ERP) on 2013-04-17

[MERGE] Merge with main branch

3702. By Jagdish Panchal (Open ERP) on 2013-04-15

[MERGE] Merge with main branch

3701. By Jagdish Panchal (Open ERP) on 2013-03-28

[MERGE] Merge with main branch

3700. By Jagdish Panchal (Open ERP) on 2013-03-25

[MERGE] merge with main branch

3699. By Jagdish Panchal (Open ERP) on 2013-03-18

[IMP] web_kanban.xml rename Delete to Remove when editing a column

3698. By Jagdish Panchal (Open ERP) on 2013-03-14

[MERGE] Merge with main branch

3697. By Jagdish Panchal (Open ERP) on 2013-03-12

[MERGE] Merge with main branch

3696. By Jagdish Panchal (Open ERP) on 2013-03-11

[IMP] web_kanban: improve code when add new record in kanban

=== modified file 'addons/web_kanban/static/src/js/kanban.js'
--- addons/web_kanban/static/src/js/kanban.js	2013-05-29 15:28:02 +0000
+++ addons/web_kanban/static/src/js/kanban.js	2013-06-03 14:01:45 +0000
@@ -209,9 +209,10 @@
         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(_.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 dataset = new instance.web.DataSetSearch(self, self.dataset.model, self.dataset.get_context());
                 var datagroup = {
                     get: function(key) {
                         return this[key];
@@ -671,7 +672,6 @@
         var $list_header = this.$records.find('.oe_kanban_group_list_header');
         var $show_more = this.$records.find('.oe_kanban_show_more');
         var $cards = this.$records.find('.oe_kanban_column_cards');
-
         _.each(records, function(record) {
             var rec = new instance.web_kanban.KanbanRecord(self, record);
             if (!prepend) {
@@ -712,6 +712,7 @@
             views: [[false, 'form']],
             type: 'ir.actions.act_window',
             target: "new",
+            context: self.dataset.get_context(),
             flags: {
                 action_buttons: true,
             }
@@ -727,7 +728,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-06-03 14:01:45 +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>