From 78b6d61537af7cd51884db77b73c06d600b6a3a3 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Mon, 17 Oct 2011 12:59:13 -0400
Subject: [PATCH] - Changed JavaScript to display the correct redirect flags for Apache/nginx.
---
interface/web/sites/templates/web_aliasdomain_edit.htm | 20 ++++++++++++++++++--
interface/web/sites/templates/web_subdomain_edit.htm | 21 +++++++++++++++++++--
interface/web/sites/templates/web_domain_redirect.htm | 2 +-
3 files changed, 38 insertions(+), 5 deletions(-)
diff --git a/interface/web/sites/templates/web_aliasdomain_edit.htm b/interface/web/sites/templates/web_aliasdomain_edit.htm
index 3f3b38d..e4f5cd1 100644
--- a/interface/web/sites/templates/web_aliasdomain_edit.htm
+++ b/interface/web/sites/templates/web_aliasdomain_edit.htm
@@ -55,14 +55,19 @@
</div>
<script language="JavaScript" type="text/javascript">
- var webId = jQuery('input[name="id"]').val();
+ var webId = jQuery('#parent_domain_id').val();
var serverId;
getServerId(webId);
- adjustForm(serverId);
+
+ jQuery('#parent_domain_id').change(function(){
+ webId = $(this).val();
+ getServerId(webId);
+ });
function getServerId(webId){
jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : webId, type : "getserverid"}, function(data) {
serverId = data.serverid;
+ adjustForm(serverId);
});
}
@@ -73,12 +78,23 @@
jQuery('#redirect_type option[value="R"]').hide();
jQuery('#redirect_type option[value="L"]').hide();
jQuery('#redirect_type option[value="R,L"]').hide();
+
+ jQuery('#redirect_type option[value="last"]').show();
+ jQuery('#redirect_type option[value="break"]').show();
+ jQuery('#redirect_type option[value="redirect"]').show();
+ jQuery('#redirect_type option[value="permanent"]').show();
+
if(selected != "no" && selected != "" && selected != "last" && selected != "break" && selected != "redirect" && selected != "permanent") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
} else {
jQuery('#redirect_type option[value="last"]').hide();
jQuery('#redirect_type option[value="break"]').hide();
jQuery('#redirect_type option[value="redirect"]').hide();
jQuery('#redirect_type option[value="permanent"]').hide();
+
+ jQuery('#redirect_type option[value="R"]').show();
+ jQuery('#redirect_type option[value="L"]').show();
+ jQuery('#redirect_type option[value="R,L"]').show();
+
if(selected != "no" && selected != "" && selected != "R" && selected != "L" && selected != "R,L") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
}
});
diff --git a/interface/web/sites/templates/web_domain_redirect.htm b/interface/web/sites/templates/web_domain_redirect.htm
index 635a44d..d3d8637 100644
--- a/interface/web/sites/templates/web_domain_redirect.htm
+++ b/interface/web/sites/templates/web_domain_redirect.htm
@@ -36,11 +36,11 @@
var webId = jQuery('input[name="id"]').val();
var serverId;
getServerId(webId);
- adjustForm(serverId);
function getServerId(webId){
jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : webId, type : "getserverid"}, function(data) {
serverId = data.serverid;
+ adjustForm(serverId);
});
}
diff --git a/interface/web/sites/templates/web_subdomain_edit.htm b/interface/web/sites/templates/web_subdomain_edit.htm
index c9f6a94..f25cc6e 100644
--- a/interface/web/sites/templates/web_subdomain_edit.htm
+++ b/interface/web/sites/templates/web_subdomain_edit.htm
@@ -41,14 +41,20 @@
</div>
<script language="JavaScript" type="text/javascript">
- var webId = jQuery('input[name="id"]').val();
+ //var webId = jQuery('input[name="id"]').val();
+ var webId = jQuery('#parent_domain_id').val();
var serverId;
getServerId(webId);
- adjustForm(serverId);
+
+ jQuery('#parent_domain_id').change(function(){
+ webId = $(this).val();
+ getServerId(webId);
+ });
function getServerId(webId){
jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : webId, type : "getserverid"}, function(data) {
serverId = data.serverid;
+ adjustForm(serverId);
});
}
@@ -59,12 +65,23 @@
jQuery('#redirect_type option[value="R"]').hide();
jQuery('#redirect_type option[value="L"]').hide();
jQuery('#redirect_type option[value="R,L"]').hide();
+
+ jQuery('#redirect_type option[value="last"]').show();
+ jQuery('#redirect_type option[value="break"]').show();
+ jQuery('#redirect_type option[value="redirect"]').show();
+ jQuery('#redirect_type option[value="permanent"]').show();
+
if(selected != "no" && selected != "" && selected != "last" && selected != "break" && selected != "redirect" && selected != "permanent") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
} else {
jQuery('#redirect_type option[value="last"]').hide();
jQuery('#redirect_type option[value="break"]').hide();
jQuery('#redirect_type option[value="redirect"]').hide();
jQuery('#redirect_type option[value="permanent"]').hide();
+
+ jQuery('#redirect_type option[value="R"]').show();
+ jQuery('#redirect_type option[value="L"]').show();
+ jQuery('#redirect_type option[value="R,L"]').show();
+
if(selected != "no" && selected != "" && selected != "R" && selected != "L" && selected != "R,L") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
}
});
--
Gitblit v1.9.1