From 0adcbbfd969731a9834ce4e018576b99fa2ecf56 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Mon, 04 May 2015 16:00:32 -0400
Subject: [PATCH] changed if-else in installer to write configs for the latest version with force-install (package not yet installed)
---
interface/web/themes/default/assets/javascripts/ispconfig.js | 38 +++++++++++++++++++++++---------------
1 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/interface/web/themes/default/assets/javascripts/ispconfig.js b/interface/web/themes/default/assets/javascripts/ispconfig.js
index 3352323..b68af57 100644
--- a/interface/web/themes/default/assets/javascripts/ispconfig.js
+++ b/interface/web/themes/default/assets/javascripts/ispconfig.js
@@ -464,7 +464,7 @@
});
},
- loadOptionInto: function(elementid,pagename) {
+ loadOptionInto: function(elementid,pagename,callback) {
var pageContentObject2 = $.ajax({
type: "GET",
url: pagename,
@@ -482,6 +482,9 @@
foo2.value=elemente[i];
el.appendChild(foo2);
}
+ if (typeof(callback) != 'undefined') {
+ callback(elementid,pagename);
+ }
},
error: function() {
ISPConfig.reportError('Ajax Request was not successful. 119');
@@ -495,7 +498,7 @@
url: "keepalive.php",
dataType: "html",
success: function(data, textStatus, jqXHR) {
- setTimeout( keepalive, 1000000 );
+ setTimeout( function() { ISPConfig.keepalive(); }, 1000000 );
},
error: function() {
ISPConfig.reportError('Session expired. Please login again.');
@@ -584,7 +587,7 @@
});
$(document).on('click', 'a[data-load-content],button[data-load-content]', function(e) {
- e.preventDefault();
+ //e.preventDefault();
var content_to_load = $(this).attr('data-load-content');
if(!content_to_load) return this;
@@ -592,7 +595,7 @@
});
$(document).on('click', 'a[data-capp],button[data-capp]', function(e) {
- e.preventDefault();
+ //e.preventDefault();
var content_to_load = $(this).attr('data-capp');
if(!content_to_load) return this;
@@ -600,7 +603,7 @@
});
$(document).on('click', 'a[data-submit-form],button[data-submit-form]', function(e) {
- e.preventDefault();
+ //e.preventDefault();
var $el = $(this);
var act = $el.attr('data-form-action');
@@ -633,8 +636,22 @@
var act = $el.attr('data-form-action');
var form = $el.attr('data-submit-form');
- act = act + '?orderby=' + column;
+ var dir = $self.attr('data-ordered');
+
+ var separator = '?';
+ if(act.indexOf("?") >= 0){
+ separator = '&';
+ }
+ act = act + separator + 'orderby=' + column;
ISPConfig.submitForm(form, act);
+
+ $(document).ajaxComplete(function() {
+ var $self = $('#pageForm .table th[data-column="' + column + '"]');
+ $self.parent().children('th[data-column]').removeAttr('data-ordered');
+ if(dir && dir == 'asc') $self.attr('data-ordered', 'desc');
+ else $self.attr('data-ordered', 'asc');
+ });
+
}
});
@@ -694,14 +711,5 @@
if ($("#pageForm .table #Filter").length > 0) {
e.preventDefault();
}
- });
-
- $('#globalsearch').ispconfigSearch({
- dataSrc: '/dashboard/ajax_get_json.php?type=globalsearch',
- resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
- noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
- noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
- searchFieldWatermark: '<tmpl_var name="globalsearch_searchfield_watermark_txt">',
- resultBoxPosition: ''
});
});
--
Gitblit v1.9.1