diff --git a/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml index 632ad9edd..e9cf886e1 100644 --- a/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml @@ -847,21 +847,11 @@ function_id = #{functionId,jdbcType=INTEGER}, - user_region1 = #{userRegion1,jdbcType=VARCHAR}, - - user_region2 = #{userRegion2,jdbcType=VARCHAR}, - - user_region3 = #{userRegion3,jdbcType=VARCHAR}, - - user_region4 = #{userRegion4,jdbcType=VARCHAR}, - - user_region5 = #{userRegion5,jdbcType=VARCHAR}, - dns_strategy_id = #{dnsStrategyId,jdbcType=INTEGER}, diff --git a/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java b/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java index 0d5c6aa6d..6d1c36ba0 100644 --- a/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java @@ -404,39 +404,19 @@ public class HttpRedirectCfgService extends CrudService @@ -61,7 +61,7 @@ diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp index cdc26593f..c1712a8bb 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp @@ -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"); - } - } diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp index ae89bb17d..83e9cc483 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp @@ -233,7 +233,6 @@ - ${serviceName1 }