diff --git a/include/staff/templates/tasks-actions.tmpl.php b/include/staff/templates/tasks-actions.tmpl.php index e323e30602aee51bd9bd7efe14a3879610a163a5..8ac9b3156a996a7eb9bb2eb3f42346e17a0963c6 100644 --- a/include/staff/templates/tasks-actions.tmpl.php +++ b/include/staff/templates/tasks-actions.tmpl.php @@ -166,6 +166,7 @@ $(function() { +'&_uid='+new Date().getTime(); var $redirect = $(this).data('redirect'); $.dialog(url, [201], function (xhr) { + $.pjax.defaults.timeout = 30000; if (!!$redirect) $.pjax({url: $redirect, container:'#pjax-container'}); else diff --git a/include/staff/ticket-tasks.inc.php b/include/staff/ticket-tasks.inc.php index c804484dbe1314b22319e7af8cb22c3da9b620a4..ebf8a875111bc28fc9b0fb9186a6458242b0a66d 100644 --- a/include/staff/ticket-tasks.inc.php +++ b/include/staff/ticket-tasks.inc.php @@ -195,7 +195,7 @@ $(function() { $container.load(url+'/'+tid+'/view', function () { $('.tip_box').remove(); $('div#tasks_content').hide(); - $.pjax({url: url, container: '#tasks_content', push: false}); + $.pjax({url: url, container: '#tasks_content', timeout: 30000, push: false}); }).show(); } else { window.location.href = $redirect ? $redirect : window.location.href; diff --git a/scp/js/scp.js b/scp/js/scp.js index 734cdb4cb4a73cceec16b66ce44ada1c6b56f01f..f8c60770dd4341208166d1e9f7d2c6461acb53b1 100644 --- a/scp/js/scp.js +++ b/scp/js/scp.js @@ -595,6 +595,7 @@ $(document).ajaxSend(function(event, xhr, settings) { /* Get config settings from the backend */ jQuery.fn.exists = function() { return this.length>0; }; +$.pjax.defaults.timeout = 30000; $.translate_format = function(str) { var translation = { 'DD': 'oo', @@ -1131,7 +1132,7 @@ if ($.support.pjax) { if (!$this.hasClass('no-pjax') && !$this.closest('.no-pjax').length && $this.attr('href').charAt(0) != '#') - $.pjax.click(event, {container: $this.data('pjaxContainer') || '#pjax-container', timeout: 2000}); + $.pjax.click(event, {container: $this.data('pjaxContainer') || '#pjax-container', timeout: 30000}); }) } diff --git a/scp/js/ticket.js b/scp/js/ticket.js index b16cc8ea386dca8cf6931a9bd1e1b6b81aabeaf9..df3fe17bb48d696f4063862ed337519ea0094246 100644 --- a/scp/js/ticket.js +++ b/scp/js/ticket.js @@ -307,7 +307,7 @@ $.refreshTicketView = function(interval) { return; clearInterval(refresh); - $.pjax({url: document.location.href, container:'#pjax-container'}); + $.pjax({url: document.location.href, container:'#pjax-container', timeout: 30000}); }, interval); $(document).on('pjax:start', function() { clearInterval(refresh);