From dc48ab33efda6f56c30d408182cfec868ef4d91f Mon Sep 17 00:00:00 2001 From: xaver <xaver@ispconfig3> Date: Sat, 24 Mar 2012 09:01:29 -0400 Subject: [PATCH] Bug #2143, wrong filter url --- interface/web/js/scrigo.js.php | 40 +++++++++++----------------------------- 1 files changed, 11 insertions(+), 29 deletions(-) diff --git a/interface/web/js/scrigo.js.php b/interface/web/js/scrigo.js.php index 5534f3e..ae0a640 100644 --- a/interface/web/js/scrigo.js.php +++ b/interface/web/js/scrigo.js.php @@ -43,8 +43,11 @@ if(jqXHR.responseText.indexOf('HEADER_REDIRECT:') > -1) { var parts = jqXHR.responseText.split(':'); loadContent(parts[1]); + } else if (jqXHR.responseText.indexOf('URL_REDIRECT:') > -1) { + var newUrl= jqXHR.responseText.substr(jqXHR.responseText.indexOf('URL_REDIRECT:') + "URL_REDIRECT:".length); + document.location.href = newUrl; } else { - alert(jqXHR.responseText); + //alert(jqXHR.responseText); } } loadMenus(); @@ -101,7 +104,7 @@ } -function submitForm(formname,target) { +function submitForm(formname,target) { var submitFormObj = jQuery.ajax({ type: "POST", url: target, data: jQuery('#'+formname).serialize(), @@ -264,6 +267,12 @@ } function del_record(link,confirmation) { + if(window.confirm(confirmation)) { + loadContent(link); + } +} + +function confirm_action(link,confirmation) { if(window.confirm(confirmation)) { loadContent(link); } @@ -491,30 +500,3 @@ } return rv; } - -function loadwebip(elementid,pagename) { - var pageContentObject2 = jQuery.ajax({ type: "GET", - url: pagename, - dataType: "html", - success: function(data, textStatus, jqXHR) { - var teste = jqXHR.responseText; - var elemente = teste.split('#'); - el=document.getElementById(elementid); - el.innerHTML=''; - for (var i = 0; i < elemente.length; ++i){ - - var foo2 = document.createElement("option"); - foo2.appendChild(document.createTextNode(elemente[i])); - foo2.value=elemente[i]; - el.appendChild(foo2); - } - }, - error: function() { - reportError('Ajax Request was not successful. 119'); - }, - }); - var ruby = document.getElementById('ruby'); - ruby.style.display = 'none'; -} - - -- Gitblit v1.9.1