gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.暂时取消对定时任务配置的限制操作；

Browse Source 
2.增加定时器的国际化code
This commit is contained in:
zhangwei
2019-01-30 15:47:43 +06:00
parent be3811688f
commit edb9f11b92
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/resources/messages/message_en.properties
View File

@@ -1497,4 +1497,5 @@ validate_error=Unexpected error occurred while validating
is_schduler=Scheduler is_schduler=Scheduler
v4_num=IPv4 Number v4_num=IPv4 Number
v6_num=IPv6 Number v6_num=IPv6 Number
always=Permanent always=Permanent
schedule=Scheduler

3
src/main/resources/messages/message_ru.properties
View File

@@ -1502,4 +1502,5 @@ is_schduler=Scheduler
validate_error=Unexpected error occurred while validating validate_error=Unexpected error occurred while validating
v4_num=IPv4 Number v4_num=IPv4 Number
v6_num=IPv6 Number v6_num=IPv6 Number
always=\u041F\u043E\u0441\u0442\u043E\u044F\u043D\u043D\u043E always=\u041F\u043E\u0441\u0442\u043E\u044F\u043D\u043D\u043E
schedule=Scheduler

3
src/main/resources/messages/message_zh_CN.properties
View File

@@ -1494,4 +1494,5 @@ everyMonth=\u6BCF\u6708
validate_error=\u9A8C\u8BC1\u65F6\u53D1\u751F\u610F\u5916\u9519\u8BEF validate_error=\u9A8C\u8BC1\u65F6\u53D1\u751F\u610F\u5916\u9519\u8BEF
v4_num=IPv4 Number v4_num=IPv4 Number
v6_num=IPv6 Number v6_num=IPv6 Number
always=\u957F\u671F always=\u957F\u671F
schedule=Scheduler

8
src/main/webapp/WEB-INF/tags/sys/delRow.tag
View File

@@ -110,11 +110,11 @@ function update(url){
var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox"); var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
var cked = $("tbody tr td input.i-checks:checkbox:checked"); 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"){//验证配置是否是定时任务，如果是定时任务，不允许修改 if(schedulerFlag!= "undefined" && schedulerFlag=="yes"){//验证配置是否是定时任务，如果是定时任务，不允许修改
top.$.jBox.tip("<spring:message code='scheduler_warning'/>", "<spring:message code='info'/>"); top.$.jBox.tip("<spring:message code='scheduler_warning'/>", "<spring:message code='info'/>");
return; return;
} } */
if($(checkboxes).filter(":checked").length==1){ if($(checkboxes).filter(":checked").length==1){
if(cked.val()==1){ if(cked.val()==1){
top.$.jBox.tip("<spring:message code='has_approved'/>", "<spring:message code='info'/>"); top.$.jBox.tip("<spring:message code='has_approved'/>", "<spring:message code='info'/>");
@@ -143,10 +143,10 @@ function passOpt(url){
var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox"); var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
if($(checkboxes).filter(":checked").length>0){ if($(checkboxes).filter(":checked").length>0){
if(validateIsScheduler(checkboxes)){//验证配置是否是定时任务，如果是定时任务，不允许手动审核 /* if(validateIsScheduler(checkboxes)){//验证配置是否是定时任务，如果是定时任务，不允许手动审核
top.$.jBox.tip("<spring:message code='scheduler_warning'/>", "<spring:message code='info'/>"); top.$.jBox.tip("<spring:message code='scheduler_warning'/>", "<spring:message code='info'/>");
return; return;
} } */
if(validateAllNoAudit(checkboxes)){ if(validateAllNoAudit(checkboxes)){
top.$.jBox.tip("<spring:message code='has_prohibit_pass'/>", "<spring:message code='info'/>"); top.$.jBox.tip("<spring:message code='has_prohibit_pass'/>", "<spring:message code='info'/>");
return; return;