Merge lp:~openerp-dev/openerp-web/trunk-journal-dashboard-tpa into lp:openerp-web

Proposed by ajay javiya (OpenERP)
Status: Work in progress
Proposed branch: lp:~openerp-dev/openerp-web/trunk-journal-dashboard-tpa
Merge into: lp:openerp-web
Diff against target: 24 lines (+6/-1)
1 file modified
addons/web_kanban/static/src/js/kanban.js (+6/-1)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/trunk-journal-dashboard-tpa
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+163271@code.launchpad.net

Description of the change

Hello,
 Return do_reload method of kanban to overwrite reload method.
 Issue:
  If we open a wizard from link on kanban record and then close that wizard ,kanban record is not reload.
Thank You.

To post a comment you must log in.
3737. By ajay javiya (OpenERP)

[IMP]: Return to overwrite do_reload method

3738. By Turkesh Patel (openERP)

[MRG] merge with lp:openerp-web

3739. By Turkesh Patel (openERP)

[IMP] improved code to bind click action in help

3740. By Turkesh Patel (openERP)

[MRG] merge with lp:openerp-web

3741. By Turkesh Patel (openERP)

[MRG] merge with lp:openerp-web

3742. By Turkesh Patel (openERP)

[MRG] merge with lp:openerp-web

3743. By Turkesh Patel (openERP)

[MRG] merge with lp:openobject-addons

3744. By Turkesh Patel (openERP)

[MRG] merge with lp:openobject-addons

3745. By Turkesh Patel (openERP)

[MRG] merge with lp:openerp-web

3746. By Turkesh Patel (openERP)

[MRG] merge with lp:openerp-web

3747. By Turkesh Patel (openERP)

[MRG] merge with lp:openerp-web

3748. By Turkesh Patel (openERP)

[MRG] merge with lp:openerp-web

3749. By Turkesh Patel (openERP)

[MRG] merge with lp:openerp-web

3750. By Turkesh Patel (openERP)

[MRG] merge with lp:openerp-web

3751. By Turkesh Patel (openERP)

[MRG] merge with lp:openerp-web

3752. By Turkesh Patel (openERP)

[MRG] merge with lp:openerp-web

3753. By Turkesh Patel (openERP)

[MRG] merge with lp:openoerp-web

3754. By Turkesh Patel (openERP)

[MRG] merge with lp:openerp-web

3755. By Turkesh Patel (openERP)

[MRG] merge with lp:openobject-addons

3756. By Turkesh Patel (openERP)

[MRG] merge with lp:openerp-web

3757. By Thibault Delavallée (OpenERP)

[MERGE] Sync with upstream

3758. By Chirag Dodiya(OpenERP)

[MRG]Merge with trunk

3759. By Chirag Dodiya(OpenERP)

[MRG]Merge with lp:openerp-web

Unmerged revisions

3759. By Chirag Dodiya(OpenERP)

[MRG]Merge with lp:openerp-web

3758. By Chirag Dodiya(OpenERP)

[MRG]Merge with trunk

3757. By Thibault Delavallée (OpenERP)

[MERGE] Sync with upstream

3756. By Turkesh Patel (openERP)

[MRG] merge with lp:openerp-web

3755. By Turkesh Patel (openERP)

[MRG] merge with lp:openobject-addons

3754. By Turkesh Patel (openERP)

[MRG] merge with lp:openerp-web

3753. By Turkesh Patel (openERP)

[MRG] merge with lp:openoerp-web

3752. By Turkesh Patel (openERP)

[MRG] merge with lp:openerp-web

3751. By Turkesh Patel (openERP)

[MRG] merge with lp:openerp-web

3750. By Turkesh Patel (openERP)

[MRG] merge with lp:openerp-web

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 2014-01-31 00:52:02 +0000
+++ addons/web_kanban/static/src/js/kanban.js 2014-03-10 05:15:15 +0000
@@ -499,6 +499,11 @@
499 this.last_position = this.$el.find('table:first').css("position");499 this.last_position = this.$el.find('table:first').css("position");
500 this.$el.find('table:first').css("position", "absolute");500 this.$el.find('table:first').css("position", "absolute");
501 $(QWeb.render('KanbanView.nocontent', { content : this.options.action.get_empty_list_help || this.options.action.help})).insertAfter(this.$('table:first'));501 $(QWeb.render('KanbanView.nocontent', { content : this.options.action.get_empty_list_help || this.options.action.help})).insertAfter(this.$('table:first'));
502 this.$el.find('.oe_view_nocontent a').click(function(ev) {
503 if ($(ev.target).attr('type')) {
504 self.do_execute_action({type: $(ev.target).attr('type'),'name':$(ev.target).attr('name')}, self.dataset);
505 }
506 });
502 this.$el.find('.oe_view_nocontent').click(function() {507 this.$el.find('.oe_view_nocontent').click(function() {
503 self.$buttons.openerpBounce();508 self.$buttons.openerpBounce();
504 });509 });
@@ -1063,7 +1068,7 @@
1063 },1068 },
1064 do_reload: function() {1069 do_reload: function() {
1065 var self = this;1070 var self = this;
1066 this.view.dataset.read_ids([this.id], this.view.fields_keys.concat(['__last_update'])).done(function(records) {1071 return this.view.dataset.read_ids([this.id], this.view.fields_keys.concat(['__last_update'])).done(function(records) {
1067 _.each(self.sub_widgets, function(el) {1072 _.each(self.sub_widgets, function(el) {
1068 el.destroy();1073 el.destroy();
1069 });1074 });