From d3fb1c7938acfe3b8408405bdebe8e754da0dd2a Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Fri, 17 Apr 2015 15:16:10 +0200 Subject: [PATCH] Upgrade process started as non-ajax request to avoid UI timeout. --- admin/inst_upgrade.php | 2 +- js/inserts.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/inst_upgrade.php b/admin/inst_upgrade.php index 948594f8..5fc66fc8 100644 --- 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 0dd14165..dacb8289 100644 --- 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; } -- 2.30.2