From c795dfd688dd414386ffdeba9fd081a4ba9bdb90 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Thu, 04 Feb 2016 10:01:47 -0500
Subject: [PATCH] added missing tables to client_delete function - Closes #3712
---
interface/web/themes/default/assets/javascripts/ispconfig.js | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/interface/web/themes/default/assets/javascripts/ispconfig.js b/interface/web/themes/default/assets/javascripts/ispconfig.js
index 439bd69..b369b53 100644
--- a/interface/web/themes/default/assets/javascripts/ispconfig.js
+++ b/interface/web/themes/default/assets/javascripts/ispconfig.js
@@ -237,29 +237,38 @@
} catch(e) {
response = responseStr;
}
+ var $response = $('<div></div>').html(response);
var msg = '';
- var okmsg = $('#OKMsg',response).html();
+ var okmsg = $response.find('#OKMsg').html();
if(okmsg){
msg = '<div id="OKMsg">'+okmsg+'</div>';
}
- var errormsg = $('#errorMsg',response).html();
+ var errormsg = $response.find('#errorMsg').html();
if(errormsg){
msg = msg+'<div id="errorMsg">'+errormsg+'</div>';
}
+
+ var csrf_key = $response.find('input[name="_csrf_key"]').val();
+ var csrf_id = $response.find('input[name="_csrf_id"]').val();
+
+ msg = msg + '<input type="hidden" name="_csrf_id" value="' + csrf_id + '" /><input type="hidden" name="_csrf_key" value="' + csrf_key + '" />';
+
return msg;
};
var frame_id = 'ajaxUploader-iframe-' + Math.round(new Date().getTime() / 1000);
- $('body').after('<iframe width="0" height="0" style="display:none;" name="'+frame_id+'" id="'+frame_id+'"/>');
- $('input[type="file"]').closest("form").attr({target: frame_id, action: target}).submit();
+ $('body').append('<iframe width="0" height="0" style="display:none;" name="'+frame_id+'" id="'+frame_id+'"/>');
$('#'+frame_id).load(function() {
var msg = handleResponse(this);
$('#errorMsg').remove();
$('#OKMsg').remove();
+ $('input[name="_csrf_key"]').remove();
+ $('input[name="_csrf_id"]').remove();
$('input[name="id"]').before(msg);
$(this).remove();
});
+ $('input[type="file"]').closest("form").attr({target: frame_id, action: target}).submit();
},
capp: function(module, redirect) {
@@ -609,7 +618,7 @@
$(document).on('click', 'a[data-load-content],button[data-load-content]', function(e) {
e.preventDefault();
- $('html, body').animate({scrollTop: $('#pageContent').offset().top}, 1000);
+ $('html, body').animate({scrollTop: 0}, 1000);
var content_to_load = $(this).attr('data-load-content');
if(!content_to_load) return this;
@@ -619,7 +628,7 @@
$(document).on('click', 'a[data-capp],button[data-capp]', function(e) {
e.preventDefault();
- $('html, body').animate({scrollTop: $('#pageContent').offset().top}, 1000);
+ $('html, body').animate({scrollTop: 0}, 1000);
var content_to_load = $(this).attr('data-capp');
if(!content_to_load) return this;
@@ -629,7 +638,7 @@
$(document).on('click', 'a[data-submit-form],button[data-submit-form]', function(e) {
e.preventDefault();
- $('html, body').animate({scrollTop: $('#pageContent').offset().top}, 1000);
+ $('html, body').animate({scrollTop: 0}, 1000);
var $el = $(this);
var act = $el.attr('data-form-action');
--
Gitblit v1.9.1