diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp index 46d42e1bb..486e096b6 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp @@ -32,6 +32,7 @@ $(function(){ var isHexbin=$(this).val(); if(isHexbin == 1){ var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val(); + keywords=keywords.replace("***and***",""); if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){ $(this).parents(".form-body").find( "div[for='" diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp index 3ed94ecd7..1fa106d41 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp @@ -32,6 +32,7 @@ $(function(){ var isHexbin=$(this).val(); if(isHexbin == 1){ var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val(); + keywords=keywords.replace("***and***",""); if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){ $(this).parents(".form-body").find( "div[for='" diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp index b71b18710..c2075e789 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp @@ -32,13 +32,14 @@ $(function(){ var isHexbin=$(this).val(); if(isHexbin == 1){ var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val(); + keywords=keywords.replace("***and***",""); if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){ $(this).parents(".form-body").find( "div[for='" + $(this).attr("name").replace("isHexbin","cfgKeywords") + "']").html(""); flag = false; - } + } } }); if(flag){ @@ -53,6 +54,13 @@ $(function(){ errorContainer: "#messageBox", }); }); +function changeDistrict(obj){ + if("others"==obj.val()){ + obj.parent().siblings(".otherValue").prop("type","text"); + }else{ + obj.parent().siblings(".otherValue").prop("type","hidden"); + } +} @@ -441,4 +449,4 @@ $(function(){ - \ No newline at end of file +