From 8ab3cdc09cfbac3157e996664616c229214f6c8d Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 21 Oct 2011 06:03:56 -0400
Subject: [PATCH] Merged revisions 2681-2739 from 3.0.4 stable branch.
---
interface/web/sites/templates/web_subdomain_edit.htm | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
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