Upgrade process started as non-ajax request to avoid UI timeout.

diff --git a/admin/inst_upgrade.php b/admin/inst_upgrade.php
index 948594f8e6adf7b735668bae1d0d31b8847e6a69..5fc66fc810378507edcc72488c4b74e01670a546 100644 (file)
--- a/admin/inst_upgrade.php
+++ b/admin/inst_upgrade.php
@@ -112,7 +112,7 @@ if ($uptodate)
 else {
        if (get_post('select_comp') === '')
                display_note(_("Select company for incremental upgrade."), 0, 1, "class='stockmankofg'");
-       submit_center('Upgrade', _('Upgrade'), true, _('Save database and perform upgrade'), 'process');
+       submit_center('Upgrade', _('Upgrade'), true, _('Save database and perform upgrade'), 'nonajax');
 }
 end_form();
 

diff --git a/js/inserts.js b/js/inserts.js
index 0dd141650f64203d2f864004ae8fd926f0d11728..dacb82898e200975d79a700a51177aa9fb6d7854 100644 (file)
--- a/js/inserts.js
+++ b/js/inserts.js
@@ -310,7 +310,7 @@ var inserts = {
                e.onclick = function(){
                        if (validate(e)) {
                                setTimeout(function() { var asp = e.getAttribute('aspect');
-                                       set_mark((asp && (asp.indexOf('process') !== -1)) ? 'progressbar.gif' : 'ajax-loader.gif');
+                                       set_mark((asp && ((asp.indexOf('process') !== -1) || (asp.indexOf('nonajax') !== -1))) ? 'progressbar.gif' : 'ajax-loader.gif');
                                }, 100);
                                return true;
                        }