diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 5fbb39e50..d12827d31 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1468,6 +1468,6 @@ not_exist=not exist real_time=Real Time history=History all_columns_hidden=All columns are hidden! -no_log=Not Do Log -all_log=Log All Logs -framework_log=Structured Logs \ No newline at end of file +no_log=No Log +all_log=Meta And File Log +framework_log=Meta Log \ 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 c3edef07d..6881b60cf 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1472,6 +1472,6 @@ not_exist=not exist real_time=Real Time history=History all_columns_hidden=All columns are hidden! -no_log=\u041d\u0435 \u041d\u0430\u0434\u043e \u0437\u0430\u043f\u0438\u0441\u0430\u0442\u044c -all_log=\u0417\u0430\u043F\u0438\u0441\u0430\u0442\u044C \u0412\u0441\u0435 \u0416\u0443\u0440\u043D\u0430\u043B\u044B -framework_log=\u0421\u0442\u0440\u0443\u043A\u0442\u0443\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u044B\u0435 \u0416\u0443\u0440\u043D\u0430\u043B\u044B \ No newline at end of file +no_log=\u041D\u0435\u0442 \u0416\u0443\u0440\u043D\u0430\u043B\u043E\u0432 +all_log=\u0421\u0442\u0440\u0443\u043A\u0442\u0443\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u044B\u0439 \u0416\u0443\u0440\u043D\u0430\u043B \u0438 \u0416\u0443\u0440\u043D\u0430\u043B-\u0444\u0430\u0439\u043B +framework_log=\u0421\u0442\u0440\u0443\u043A\u0442\u0443\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u044B\u0439 \u0416\u0443\u0440\u043D\u0430\u043B \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp index ce7c02538..8b3bac4e8 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp @@ -13,9 +13,9 @@ $(document) .ready( function() { - if($("input[name='compileId']").val()==null||$("input[name='compileId']").val()==''){ + /* if($("input[name='compileId']").val()==null||$("input[name='compileId']").val()==''){ $("input[name=doLog][value=1]").prop("checked",true); - } + } */ /* $(".glyphicon-plus").first().click(); */ /* $("#cancel").on("click", function() { window.history.back(); @@ -217,8 +217,8 @@ -
-
+
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp index fef644d19..e3a580387 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp @@ -13,9 +13,9 @@ $(document) .ready( function() { - if($("input[name='compileId']").val()==null||$("input[name='compileId']").val()==''){ + /* if($("input[name='compileId']").val()==null||$("input[name='compileId']").val()==''){ $("input[name=doLog][value=1]").prop("checked",true); - } + } */ $(".glyphicon-plus").first().click(); /* $("#cancel").on("click", function() { window.history.back(); @@ -217,8 +217,8 @@
-
-
+
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp index e986383f3..598256c1f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp @@ -148,6 +148,7 @@ $(function(){ serviceId="${service.serviceId }" protocolId="${service.protocolId }" regionCode="${service.regionCode }" + configDoLog="${service.configDoLog }" value="${service.action }" class="required action" checked>