gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

http block 的content可空

Browse Source 
http userregion修改，可修改为空
http 管控应答码增加应答码数字，修改应答码国际化英文
This commit is contained in:
duandongmei
2018-08-01 12:46:41 +08:00
parent 8449040f65
commit 21ad7208a5
6 changed files with 16 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/webapp/WEB-INF/views/cfg/actionRegionForm.jsp
View File

@@ -22,9 +22,9 @@
<div class="col-md-6">
<select name="userRegion1"
class="selectpicker show-tick form-control">
<option value="" <c:if test="${empty _cfg.userRegion1}">selected</c:if>><spring:message code="select"/></option>
<option value="" <c:if test="${empty _cfg.userRegion1}">selected</c:if>>Silent</option>
<c:forEach items="${fns:getDictList('RESPONSE_CODE')}" var="responseCodeC">
<option value="${responseCodeC.itemCode}" <c:if test="${_cfg.userRegion1 eq responseCodeC.itemCode}">selected</c:if>><spring:message code="${responseCodeC.itemValue}"/></option>
<option value="${responseCodeC.itemCode}" <c:if test="${_cfg.userRegion1 eq responseCodeC.itemCode}">selected</c:if>>${responseCodeC.itemCode} <spring:message code="${responseCodeC.itemValue}"/></option>
</c:forEach>
</select>
</div>
@@ -61,7 +61,7 @@
<select name="userRegion1"
class="selectpicker show-tick form-control required">
<c:forEach items="${fns:getDictList('REDIRECT_RESPONSE_CODE')}" var="redirectResponseCodeC">
<option value="${redirectResponseCodeC.itemCode}" <c:if test="${_cfg.userRegion1==redirectResponseCodeC.itemCode || (_cfg.userRegion1==null && redirectResponseCodeC.itemCode==1)}">selected</c:if>><spring:message code="${redirectResponseCodeC.itemValue}"/></option>
<option value="${redirectResponseCodeC.itemCode}" <c:if test="${_cfg.userRegion1==redirectResponseCodeC.itemCode || (_cfg.userRegion1==null && redirectResponseCodeC.itemCode==1)}">selected</c:if>>${responseCodeC.itemCode} <spring:message code="${redirectResponseCodeC.itemValue}"/></option>
</c:forEach>
</select>
</div>

18
src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp
View File

@@ -13,13 +13,6 @@
$(document)
.ready(
function() {
var action=$(".action").val();
if(action == 16){
userRegionSwitch($("select[name=userRegion1]").val());
$("select[name=userRegion1]").on("change", function() {
userRegionSwitch($(this).val());
});
}
$("#cancel").on("click", function() {
window.history.back();
});
@@ -102,17 +95,6 @@
$("." + contentClassName).addClass("hidden").addClass("disabled");
$("." + addBtnClassName).removeClass("hidden");
}
function userRegionSwitch(userRegion1){
if(userRegion1 == null || userRegion1 == ''){
$("input[name=userRegion2]").removeClass("required");
$("font[class=userRegion2]").addClass("hidden");
$("div[for=userRegion2]").addClass("hidden");
}else{
$(".userRegion2").removeClass("hidden");
$("input[name=userRegion2]").addClass("required");
$("div[for=userRegion2]").removeClass("hidden");
}
}
</script>
</head>
<body>

1
src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
View File

@@ -233,7 +233,6 @@
<c:set var="action" value="${serviceDict.action }"/>
</c:if>
</c:forEach>
${serviceName1 }
<div class="theme-panel hidden-xs hidden-sm">
<c:if test="${action eq 16 }">
<c:set var="configPermissionName" value="control:httpBlock:config"/>