Merge lp:~openerp-dev/openerp-web/trunk-asset-bug-fix-ado into lp:openerp-web

[Amit Dodiya (OpenERP)]

Hello,

Fix following issues:
1). Reload form on click of button if option reload_whole_on_button is supplied from o2m field & button is not appear in center issue &
2). Fixed the issue of warning message in that warning popup was not working
Regards,
Amit

[lp:~openerp-dev/openerp-web/trunk-asset-bug-fix-ado]

3999. By Antony Lesuisse (OpenERP) on 2014-05-01

[MERGE] saas-4 up to <email address hidden>

4000. By Antony Lesuisse (OpenERP) on 2014-05-01

[FIX] web_kanban_gauge needs raphaeljs temporarly back in assets_backend

4001. By Antony Lesuisse (OpenERP) on 2014-05-01

[FIX] qweb loading concat mode only, increase cache age to one day

4002. By Fabien Meghazi (OpenERP) on 2014-05-01

[FIX] database manager

4003. By Géry Debongnie on 2014-05-02

[MERGE] merge the last changes to improve the 'stat buttons' support in web

Many small tweaks/css changes to correctly display the stat buttons in
various situations (with/without icons, with/without strings, with sub
widgets, ...)

4004. By jke-openerp on 2014-05-05

[MERGE] Merge with trunk-cal-V8-jke. - Change field datetime into date or datetime according to that event type is in all day or not...

4005. By Launchpad Translations on behalf of openerp on 2014-05-06

Launchpad automatic translations update.

4006. By Fabien Meghazi (OpenERP) on 2014-05-06

[ADD] openerp.loadBundle()

4007. By Fabien Meghazi (OpenERP) on 2014-05-06

[IMP] do_warn on ClientAction not found

4008. By Fabien Meghazi (OpenERP) on 2014-05-06

[FIX] jQuery.ui - boostrap conflicts

4009. By Mohammed Shekha on 2014-05-06

[IMP] Jinja template for database manager

4010. By Fabien Meghazi (OpenERP) on 2014-05-06

[REM] html_template and render_bootstrap_template()

4011. By Fabien Meghazi (OpenERP) on 2014-05-07

[FIX] Do not self close empty elements that are not html void elements

4012. By Amit Dodiya (OpenERP) on 2014-05-08

[FIX] 1) Fixed the issue of warning message in that warning popup was not working Merge branch: lp:~openerp-dev/openerp-web/trunk-reactivate_closed_contract-jpr 2) reload form on click of button if option reload_whole_on_button is supplied from o2m field

Unmerged revisions

4012. By Amit Dodiya (OpenERP) on 2014-05-08

[FIX] 1) Fixed the issue of warning message in that warning popup was not working Merge branch: lp:~openerp-dev/openerp-web/trunk-reactivate_closed_contract-jpr 2) reload form on click of button if option reload_whole_on_button is supplied from o2m field

=== modified file 'addons/web/static/src/js/chrome.js'
--- addons/web/static/src/js/chrome.js	2014-04-23 12:37:35 +0000
+++ addons/web/static/src/js/chrome.js	2014-05-08 10:21:34 +0000
@@ -316,6 +316,7 @@
         this.error = error;
     },
     display: function() {
+        var self = this;
         error = this.error;
         error.data.message = error.data.arguments[0];
 
@@ -323,14 +324,13 @@
             size: 'medium',
             title: "OpenERP " + (_.str.capitalize(error.type) || "Warning"),
             buttons: [
-                {text: _t("Ok"), click: function() { this.$el.parents('.modal').modal('hide'); }},
+                {text: _t("Ok"), click: function() { self.$el.parents('.modal').modal('hide');  self.destroy();}},
                 {text: error.data.arguments[2], click: function() {
                     window.location.href='#action='+error.data.arguments[1];
-                    this.$el.parents('.modal').modal('hide');
+                    self.destroy();
                 }}
             ],
         }, QWeb.render('CrashManager.warning', {error: error})).open();
-        this.destroy();
     }
 });
 instance.web.crash_manager_registry.add('openerp.exceptions.RedirectWarning', 'instance.web.RedirectWarningHandler');

=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js	2014-05-02 12:33:55 +0000
+++ addons/web/static/src/js/view_form.js	2014-05-08 10:21:34 +0000
@@ -4357,7 +4357,11 @@
             else
                 return $.when();
         }).done(function () {
-            if (!self.o2m.options.reload_on_button) {
+            if (self.o2m.options.reload_whole_on_button){
+                self.handle_button(name, id, function(){
+                self.o2m.dataset.parent_view.recursive_reload();
+                });
+            }else if (!self.o2m.options.reload_on_button) {
                 self.handle_button(name, id, callback);
             }else {
                 self.handle_button(name, id, function(){