Odoo Web (MOVED TO GITHUB)

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

  1. trunk-kanban_column_edition-jap
  2. Merge into trunk
Proposed by Jagdish Panchal (Open ERP)
Status: Work in progress
Proposed branch: lp:~openerp-dev/openerp-web/trunk-kanban_column_edition-jap
Merge into: lp:openerp-web
Diff against target: 53 lines (+5/-4)
2 files modified
addons/web_kanban/static/src/js/kanban.js (+4/-3)
addons/web_kanban/static/src/xml/web_kanban.xml (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/trunk-kanban_column_edition-jap
Reviewer Review Type Date Requested Status
OpenERP R&D Web Team Pending
Review via email: mp+154022@code.launchpad.net

Description of the change

Hello,

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

Thanks
JAP

To post a comment you must log in.
lp:~openerp-dev/openerp-web/trunk-kanban_column_edition-jap updated
3700. By Jagdish Panchal (Open ERP)

[MERGE] merge with main branch

3701. By Jagdish Panchal (Open ERP)

[MERGE] Merge with main branch

3702. By Jagdish Panchal (Open ERP)

[MERGE] Merge with main branch

3703. By Jagdish Panchal (Open ERP)

[MERGE] Merge with main branch

3704. By Jignesh Rathod(OpenERP)

[MERGE] Trunk web.

3705. By Amit Bhavsar (Open ERP)

[MERGE] merge with latest trunk

Unmerged revisions

3705. By Amit Bhavsar (Open ERP)

[MERGE] merge with latest trunk

3704. By Jignesh Rathod(OpenERP)

[MERGE] Trunk web.

3703. By Jagdish Panchal (Open ERP)

[MERGE] Merge with main branch

3702. By Jagdish Panchal (Open ERP)

[MERGE] Merge with main branch

3701. By Jagdish Panchal (Open ERP)

[MERGE] Merge with main branch

3700. By Jagdish Panchal (Open ERP)

[MERGE] merge with main branch

3699. By Jagdish Panchal (Open ERP)

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

3698. By Jagdish Panchal (Open ERP)

[MERGE] Merge with main branch

3697. By Jagdish Panchal (Open ERP)

[MERGE] Merge with main branch

3696. By Jagdish Panchal (Open ERP)

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
209 form.on('record_created', self, function(r) {209 form.on('record_created', self, function(r) {
210 (new instance.web.DataSet(self, self.group_by_field.relation)).name_get([r]).done(function(new_record) {210 (new instance.web.DataSet(self, self.group_by_field.relation)).name_get([r]).done(function(new_record) {
211 am.dialog.close();211 am.dialog.close();
212 if(_.include(_.pluck(self.groups,'title'),new_record[0][1]))return;
212 var domain = self.dataset.domain.slice(0);213 var domain = self.dataset.domain.slice(0);
213 domain.push([self.group_by, '=', new_record[0][0]]);214 domain.push([self.group_by, '=', new_record[0][0]]);
214 var dataset = new instance.web.DataSetSearch(self, self.dataset.model, self.dataset.get_context(), domain);215 var dataset = new instance.web.DataSetSearch(self, self.dataset.model, self.dataset.get_context());
215 var datagroup = {216 var datagroup = {
216 get: function(key) {217 get: function(key) {
217 return this[key];218 return this[key];
@@ -671,7 +672,6 @@
671 var $list_header = this.$records.find('.oe_kanban_group_list_header');672 var $list_header = this.$records.find('.oe_kanban_group_list_header');
672 var $show_more = this.$records.find('.oe_kanban_show_more');673 var $show_more = this.$records.find('.oe_kanban_show_more');
673 var $cards = this.$records.find('.oe_kanban_column_cards');674 var $cards = this.$records.find('.oe_kanban_column_cards');
674
675 _.each(records, function(record) {675 _.each(records, function(record) {
676 var rec = new instance.web_kanban.KanbanRecord(self, record);676 var rec = new instance.web_kanban.KanbanRecord(self, record);
677 if (!prepend) {677 if (!prepend) {
@@ -712,6 +712,7 @@
712 views: [[false, 'form']],712 views: [[false, 'form']],
713 type: 'ir.actions.act_window',713 type: 'ir.actions.act_window',
714 target: "new",714 target: "new",
715 context: self.dataset.get_context(),
715 flags: {716 flags: {
716 action_buttons: true,717 action_buttons: true,
717 }718 }
@@ -727,7 +728,7 @@
727 do_action_delete: function() {728 do_action_delete: function() {
728 var self = this;729 var self = this;
729 if (confirm(_t("Are you sure to remove this column ?"))) {730 if (confirm(_t("Are you sure to remove this column ?"))) {
730 (new instance.web.DataSet(self, self.view.group_by_field.relation)).unlink([self.value]).done(function(r) {731 (new instance.web.DataSet(self, self.view.group_by_field.relation, self.dataset.get_context())).unlink([self.value]).done(function(r) {
731 self.view.do_reload();732 self.view.do_reload();
732 });733 });
733 }734 }
734735
=== 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 @@
45 <li><a data-action="toggle_fold" href="#">Fold</a></li>45 <li><a data-action="toggle_fold" href="#">Fold</a></li>
46 <t t-if="widget.view.grouped_by_m2o and widget.value">46 <t t-if="widget.view.grouped_by_m2o and widget.value">
47 <li><a data-action="edit" href="#">Edit</a></li>47 <li><a data-action="edit" href="#">Edit</a></li>
48 <li><a data-action="delete" href="#">Delete</a></li>48 <li><a data-action="delete" href="#">Remove</a></li>
49 </t>49 </t>
50 </ul>50 </ul>
51 </div>51 </div>