From ef5e737bd49020dae602dcaa5498fb93b95cf858 Mon Sep 17 00:00:00 2001 From: wangxin Date: Wed, 12 Sep 2018 13:20:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E5=8D=8F=E8=AE=AE=EF=BC=8CAP?= =?UTF-8?q?P=E5=8D=8F=E8=AE=AE=E9=85=8D=E7=BD=AE=EF=BC=8C=E7=9B=91?= =?UTF-8?q?=E6=B5=8B=E4=B8=9A=E5=8A=A1=EF=BC=8Cip=E5=9F=9F=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=B1=95=E5=BC=80=EF=BC=8C=E5=B9=B6=E4=B8=94=E5=BF=85?= =?UTF-8?q?=E9=A1=BB=E8=BE=93=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/messages/message_en.properties | 3 ++- src/main/resources/messages/message_ru.properties | 3 ++- src/main/resources/messages/message_zh_CN.properties | 3 ++- .../webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp | 9 ++++++++- src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp | 9 ++++++++- 5 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 4877442a2..ff7a35546 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1145,4 +1145,5 @@ dest_country=Dest IP Country MM_SPEAKER_RECOGNIZATION=Speaker Recognization MM_LOGO_DETECTION=Logo Detection MM_FACE_RECOGNIZATION=Face Recognization -preset=Preset \ No newline at end of file +preset=Preset +ip_must_select=IP Configuration must select \ No newline at end of file diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 2c5d44e22..c67825cec 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1136,4 +1136,5 @@ dest_country=\u0421\u0442\u0440\u0430\u043D\u0430 \u0446\u0435\u043B\u0435\u0432 MM_SPEAKER_RECOGNIZATION=Speaker Recognization MM_LOGO_DETECTION=Logo Detection MM_FACE_RECOGNIZATION=Face Recognization -preset=Preset \ No newline at end of file +preset=Preset +ip_must_select=IP配置必选 \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 29181b949..900df1bd7 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1143,4 +1143,5 @@ dest_country=\u76EE\u7684IP\u6240\u5C5E\u56FD\u5BB6 MM_SPEAKER_RECOGNIZATION=\u8BF4\u8BDD\u4EBA\u8BC6\u522B MM_LOGO_DETECTION=\u53F0\u6807\u8BC6\u522B MM_FACE_RECOGNIZATION=\u4EBA\u8138\u8BC6\u522B -preset=\u9884\u7F6E \ No newline at end of file +preset=\u9884\u7F6E +ip_must_select=IP\u914D\u7F6E\u5FC5\u9009 \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp index 24dfd8847..b8005a74b 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp @@ -18,6 +18,9 @@ $(function(){ }else{ $(".subscribeId").hide(); } + if($(this).val()==1){ + $(".ipPortAdd").click(); + } }); $("#serviceId").val($(".action:checked").attr("serviceId")); $("#protocolId").val($(".action:checked").attr("protocolId")); @@ -46,6 +49,10 @@ $(function(){ top.$.jBox.tip("", ""); return; } */ + if($("[name=action]:checked").val()==1&&$(".ipPortAdd").parents(".form-section").next(".boxSolid").is(":hidden")){ + top.$.jBox.tip("", ""); + return false; + } $(".boxSolid:visible").find("input[name$='cfgKeywords']").each(function(){ if($(this).val()==''){ $(this).parents(".form-group").find( @@ -330,7 +337,7 @@ var delContent = function(contentClassName, addBtnClassName) { diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp index 74bf2b1ae..984d5978e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp @@ -24,6 +24,9 @@ $(function(){ }else{ $("#ratelimit").hide(); } + if($(this).val()==1){ + $(".ipPortAdd").click(); + } }); $("#serviceId").val($(".action:checked").attr("serviceId")); $("#protocolId").val($(".action:checked").attr("protocolId")); @@ -51,6 +54,10 @@ $(function(){ } */ var flag = true; + if($("[name=action]:checked").val()==1&&$(".ipPortAdd").parents(".form-section").next(".boxSolid").is(":hidden")){ + top.$.jBox.tip("", ""); + return false; + } $(".boxSolid:visible").find("input[name$='cfgKeywords']").each(function(){ if($(this).val()==''){ @@ -299,7 +306,7 @@ var delContent = function(contentClassName, addBtnClassName) {