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

(1)审核修正userregion，定时userregion修正

Browse Source 
(2)form表单monit修正，list group为空报错修复
(3)删除组下的域配置相关逻辑修正
This commit is contained in:
wangxin
2019-06-14 18:47:31 +08:00
parent 0f06c49b48
commit 1d64a1bc0f
11 changed files with 392 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp
View File

@@ -240,6 +240,9 @@ var delContent = function(contentClassName, addBtnClassName) {
<c:when test="${service.action eq 16}">
<spring:message code="block"/>
</c:when>
<c:when test="${service.action eq 1}">
<spring:message code="monitor"/>
</c:when>
<c:otherwise>
<spring:message code="${service.actionCode }"/>
</c:otherwise>
@@ -317,7 +320,7 @@ var delContent = function(contentClassName, addBtnClassName) {
<div class="row">
<div class="col-md-6 ipGroup">
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_group"/></label>
<label class="control-label col-md-3"><spring:message code="ip_group"/></label>
<div class="col-md-6">
<select name="ipGroup" data-live-search="true" class="selectpicker form-control form-control" multiple data-live-search="true">
<c:forEach items="${ipGroups}" var="ipGroup">
@@ -330,7 +333,7 @@ var delContent = function(contentClassName, addBtnClassName) {
</div>
<div class="col-md-6 subscribeIdGroup">
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="subscribe_id_group"/></label>
<label class="control-label col-md-3"><spring:message code="subscribe_id_group"/></label>
<div class="col-md-6">
<select name="subscribeIdGroup" data-live-search="true" class="selectpicker form-control form-control " multiple data-live-search="true">
<c:forEach items="${subscribeIdGroups}" var="subscribeIdGroup">
@@ -346,7 +349,7 @@ var delContent = function(contentClassName, addBtnClassName) {
<div class="row">
<div class="col-md-6 urlGroup">
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="url_group"/></label>
<label class="control-label col-md-3"><spring:message code="url_group"/></label>
<div class="col-md-6">
<select name="urlGroup" data-live-search="true" class="selectpicker form-control form-control " multiple data-live-search="true" >
<c:forEach items="${urlGroups}" var="urlGroup">
@@ -359,7 +362,7 @@ var delContent = function(contentClassName, addBtnClassName) {
</div>
<div class="col-md-6 domainGroup">
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="domain_group"/></label>
<label class="control-label col-md-3"><spring:message code="domain_group"/></label>
<div class="col-md-6">
<select name="domainGroup" data-live-search="true" class="selectpicker form-control " multiple data-live-search="true">
<c:forEach items="${domainGroups}" var="domainGroup">

28
src/main/webapp/WEB-INF/views/cfg/objgroup/list.jsp
View File

@@ -55,18 +55,20 @@
if($("td[commonGroupIds]")){
var groups=[];
$("td[commonGroupIds]").each(function(){
var json=JSON.parse($(this).attr("commonGroupIds"));
if(json.ipGroup){
groups.push(json.ipGroup.substring(1,json.ipGroup.length-1));
}
if(json.urlGroup){
groups.push(json.urlGroup.substring(1,json.urlGroup.length-1));
}
if(json.subscribeIdGroup){
groups.push(json.subscribeIdGroup.substring(1,json.subscribeIdGroup.length-1));
}
if(json.domainGroup){
groups.push(json.domainGroup.substring(1,json.domainGroup.length-1));
if($(this).attr("commonGroupIds")!=""){
var json=JSON.parse($(this).attr("commonGroupIds"));
if(json.ipGroup){
groups.push(json.ipGroup.substring(1,json.ipGroup.length-1));
}
if(json.urlGroup){
groups.push(json.urlGroup.substring(1,json.urlGroup.length-1));
}
if(json.subscribeIdGroup){
groups.push(json.subscribeIdGroup.substring(1,json.subscribeIdGroup.length-1));
}
if(json.domainGroup){
groups.push(json.domainGroup.substring(1,json.domainGroup.length-1));
}
}
});
if(groups.length>0){
@@ -102,7 +104,7 @@
}
}
});
});
</script>
</head>