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

[ajay javiya (OpenERP)]

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.

[lp:~openerp-dev/openerp-web/trunk-journal-dashboard-tpa]

3737. By ajay javiya (OpenERP) on 2013-05-10

[IMP]: Return to overwrite do_reload method

3738. By Turkesh Patel (openERP) on 2013-05-30

[MRG] merge with lp:openerp-web

3739. By Turkesh Patel (openERP) on 2013-05-30

[IMP] improved code to bind click action in help

3740. By Turkesh Patel (openERP) on 2013-06-05

[MRG] merge with lp:openerp-web

3741. By Turkesh Patel (openERP) on 2013-06-25

[MRG] merge with lp:openerp-web

3742. By Turkesh Patel (openERP) on 2013-07-01

[MRG] merge with lp:openerp-web

3743. By Turkesh Patel (openERP) on 2013-07-16

[MRG] merge with lp:openobject-addons

3744. By Turkesh Patel (openERP) on 2013-07-23

[MRG] merge with lp:openobject-addons

3745. By Turkesh Patel (openERP) on 2013-08-08

[MRG] merge with lp:openerp-web

3746. By Turkesh Patel (openERP) on 2013-08-16

[MRG] merge with lp:openerp-web

3747. By Turkesh Patel (openERP) on 2013-08-21

[MRG] merge with lp:openerp-web

3748. By Turkesh Patel (openERP) on 2013-08-22

[MRG] merge with lp:openerp-web

3749. By Turkesh Patel (openERP) on 2013-08-30

[MRG] merge with lp:openerp-web

3750. By Turkesh Patel (openERP) on 2013-09-04

[MRG] merge with lp:openerp-web

3751. By Turkesh Patel (openERP) on 2013-10-09

[MRG] merge with lp:openerp-web

3752. By Turkesh Patel (openERP) on 2013-10-29

[MRG] merge with lp:openerp-web

3753. By Turkesh Patel (openERP) on 2014-01-28

[MRG] merge with lp:openoerp-web

3754. By Turkesh Patel (openERP) on 2014-01-31

[MRG] merge with lp:openerp-web

3755. By Turkesh Patel (openERP) on 2014-02-03

[MRG] merge with lp:openobject-addons

3756. By Turkesh Patel (openERP) on 2014-02-12

[MRG] merge with lp:openerp-web

3757. By Thibault Delavallée (OpenERP) on 2014-02-18

[MERGE] Sync with upstream

3758. By Chirag Dodiya(OpenERP) on 2014-03-04

[MRG]Merge with trunk

3759. By Chirag Dodiya(OpenERP) on 2014-03-10

[MRG]Merge with lp:openerp-web

Unmerged revisions

3759. By Chirag Dodiya(OpenERP) on 2014-03-10

[MRG]Merge with lp:openerp-web

3758. By Chirag Dodiya(OpenERP) on 2014-03-04

[MRG]Merge with trunk

3757. By Thibault Delavallée (OpenERP) on 2014-02-18

[MERGE] Sync with upstream

3756. By Turkesh Patel (openERP) on 2014-02-12

[MRG] merge with lp:openerp-web

3755. By Turkesh Patel (openERP) on 2014-02-03

[MRG] merge with lp:openobject-addons

3754. By Turkesh Patel (openERP) on 2014-01-31

[MRG] merge with lp:openerp-web

3753. By Turkesh Patel (openERP) on 2014-01-28

[MRG] merge with lp:openoerp-web

3752. By Turkesh Patel (openERP) on 2013-10-29

[MRG] merge with lp:openerp-web

3751. By Turkesh Patel (openERP) on 2013-10-09

[MRG] merge with lp:openerp-web

3750. By Turkesh Patel (openERP) on 2013-09-04

[MRG] merge with lp:openerp-web

=== 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 @@
         this.last_position = this.$el.find('table:first').css("position");
         this.$el.find('table:first').css("position", "absolute");
         $(QWeb.render('KanbanView.nocontent', { content : this.options.action.get_empty_list_help || this.options.action.help})).insertAfter(this.$('table:first'));
+        this.$el.find('.oe_view_nocontent a').click(function(ev) {
+            if ($(ev.target).attr('type')) {
+                self.do_execute_action({type: $(ev.target).attr('type'),'name':$(ev.target).attr('name')}, self.dataset);
+            }
+        });
         this.$el.find('.oe_view_nocontent').click(function() {
             self.$buttons.openerpBounce();
         });
@@ -1063,7 +1068,7 @@
     },
     do_reload: function() {
         var self = this;
-        this.view.dataset.read_ids([this.id], this.view.fields_keys.concat(['__last_update'])).done(function(records) {
+        return this.view.dataset.read_ids([this.id], this.view.fields_keys.concat(['__last_update'])).done(function(records) {
              _.each(self.sub_widgets, function(el) {
                  el.destroy();
              });