From edb9f11b92ead84351b8d0538088f252d4b80730 Mon Sep 17 00:00:00 2001 From: zhangwei Date: Wed, 30 Jan 2019 15:47:43 +0600 Subject: [PATCH] =?UTF-8?q?1.=E6=9A=82=E6=97=B6=E5=8F=96=E6=B6=88=E5=AF=B9?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E9=85=8D=E7=BD=AE=E7=9A=84?= =?UTF-8?q?=E9=99=90=E5=88=B6=E6=93=8D=E4=BD=9C=EF=BC=9B=202.=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=AE=9A=E6=97=B6=E5=99=A8=E7=9A=84=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96code?= 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 ++- src/main/webapp/WEB-INF/tags/sys/delRow.tag | 8 ++++---- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 2005e67db..b8898478b 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1497,4 +1497,5 @@ validate_error=Unexpected error occurred while validating is_schduler=Scheduler v4_num=IPv4 Number v6_num=IPv6 Number -always=Permanent \ No newline at end of file +always=Permanent +schedule=Scheduler \ 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 ea13644c6..11c33dd11 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1502,4 +1502,5 @@ is_schduler=Scheduler validate_error=Unexpected error occurred while validating v4_num=IPv4 Number v6_num=IPv6 Number -always=\u041F\u043E\u0441\u0442\u043E\u044F\u043D\u043D\u043E \ No newline at end of file +always=\u041F\u043E\u0441\u0442\u043E\u044F\u043D\u043D\u043E +schedule=Scheduler \ 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 8b1b6d8a2..a19bce9c9 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1494,4 +1494,5 @@ everyMonth=\u6BCF\u6708 validate_error=\u9A8C\u8BC1\u65F6\u53D1\u751F\u610F\u5916\u9519\u8BEF v4_num=IPv4 Number v6_num=IPv6 Number -always=\u957F\u671F \ No newline at end of file +always=\u957F\u671F +schedule=Scheduler \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/sys/delRow.tag b/src/main/webapp/WEB-INF/tags/sys/delRow.tag index cf675f16d..0d1d38148 100644 --- a/src/main/webapp/WEB-INF/tags/sys/delRow.tag +++ b/src/main/webapp/WEB-INF/tags/sys/delRow.tag @@ -110,11 +110,11 @@ function update(url){ var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox"); var cked = $("tbody tr td input.i-checks:checkbox:checked"); - var schedulerFlag = $(cked).parent().parent().find(".schedulerFlag").find("span").attr("isScheduler"); + /* var schedulerFlag = $(cked).parent().parent().find(".schedulerFlag").find("span").attr("isScheduler"); if(schedulerFlag!= "undefined" && schedulerFlag=="yes"){//验证配置是否是定时任务，如果是定时任务，不允许修改 top.$.jBox.tip("", ""); return; - } + } */ if($(checkboxes).filter(":checked").length==1){ if(cked.val()==1){ top.$.jBox.tip("", ""); @@ -143,10 +143,10 @@ function passOpt(url){ var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox"); if($(checkboxes).filter(":checked").length>0){ - if(validateIsScheduler(checkboxes)){//验证配置是否是定时任务，如果是定时任务，不允许手动审核 + /* if(validateIsScheduler(checkboxes)){//验证配置是否是定时任务，如果是定时任务，不允许手动审核 top.$.jBox.tip("", ""); return; - } + } */ if(validateAllNoAudit(checkboxes)){ top.$.jBox.tip("", ""); return;