Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
This commit is contained in:
chenjinsong
@@ -115,7 +115,12 @@ var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
|
||||
top.$.jBox.confirm("<spring:message code='confirm_message'/>","<spring:message code='info'/>",function(v,h,f){
|
||||
|
||||
if(v=="ok"){
|
||||
window.location = url+"?ids="+ids;
|
||||
if(url.indexOf("?")>0){
|
||||
window.location = url+"&ids="+ids;
|
||||
}else{
|
||||
window.location = url+"?ids="+ids;
|
||||
}
|
||||
|
||||
//$("#searchForm").submit();
|
||||
}
|
||||
},{buttonsFocus:1});
|
||||
|
||||
@@ -24,6 +24,14 @@
|
||||
$("#keywords").attr("value",'');
|
||||
$("#searchForm")[0].reset();
|
||||
});
|
||||
//全选及取消
|
||||
$("#checkAll").change(function(){
|
||||
if($("#checkAll").prop("checked")){
|
||||
$("input.i-checks").prop("checked",true);
|
||||
}else{
|
||||
$("input.i-checks").prop("checked",false);
|
||||
}
|
||||
});
|
||||
});
|
||||
//查询
|
||||
function page(n,s){
|
||||
@@ -32,6 +40,24 @@
|
||||
$("#searchForm").submit();
|
||||
return false;
|
||||
}
|
||||
//修改配置
|
||||
function updateCfg(){
|
||||
var cked = $('tbody tr td input.i-checks:checkbox:checked');
|
||||
if(cked.val()==1){
|
||||
top.$.jBox.tip("<spring:message code='has_approved'/>", "<spring:message code='info'/>");
|
||||
return;
|
||||
}else if(cked.val()==3){
|
||||
top.$.jBox.tip("<spring:message code='cancel_approved'/>", "<spring:message code='info'/>");
|
||||
return;
|
||||
}
|
||||
if(cked.length==1){
|
||||
window.location = "${ctx}/cfg/app/updateForm?serviceId="+$("#serviceId").val()+"&action="+
|
||||
$("#action").val()+"&cfgId="+cked.attr("id")+"&cfgName="+$("#cfgName").val();
|
||||
}else{
|
||||
top.$.jBox.tip("<spring:message code='check_one'/>", "<spring:message code='info'/>");
|
||||
return;
|
||||
}
|
||||
}
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
@@ -114,6 +140,41 @@
|
||||
<button type="button" class="btn btn-default" id="filter-btn"> 筛选 <i class="fa fa-angle-double-down"></i></button>
|
||||
</div>
|
||||
<div class="pull-right">
|
||||
|
||||
<c:if test="${audit==0}">
|
||||
<shiro:hasPermission name="cfg:edit">
|
||||
<button type="button" class="btn btn-default" onclick="updateCfg()">
|
||||
<i class="fa fa-edit"></i> <spring:message code="edit"/> </button>
|
||||
</shiro:hasPermission>
|
||||
<shiro:hasPermission name="cfg:delete">
|
||||
<sys:delRow url="${ctx}/cfg/app/deleteCfg?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}" id="contentTable" label="delete"></sys:delRow>
|
||||
<%-- <button type="button" class="btn btn-default" onclick="deleteCfg()">
|
||||
<i class="fa fa-remove"></i> <spring:message code="delete"/> </button> --%>
|
||||
</shiro:hasPermission>
|
||||
</c:if>
|
||||
<c:if test="${audit==1}">
|
||||
<shiro:hasPermission name="cfg:audit">
|
||||
<div class="btn-group">
|
||||
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
|
||||
<i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>
|
||||
<i class="fa fa-angle-down"></i>
|
||||
</button>
|
||||
<ul class="dropdown-menu pull-right">
|
||||
<li><sys:delRow url="${ctx}/cfg/app/auditCfg?serviceId=${serviceId}&action=${action}&auditState=1&cfgName=${cfgName}" id="contentTable" label="approved"></sys:delRow></li>
|
||||
<li><sys:delRow url="${ctx}/cfg/app/auditCfg?serviceId=${serviceId}&action=${action}&auditState=2&cfgName=${cfgName}" id="contentTable" label="unapproved"></sys:delRow></li>
|
||||
<li><sys:delRow url="${ctx}/cfg/app/auditCfg?serviceId=${serviceId}&action=${action}&auditState=3&cfgName=${cfgName}" id="contentTable" label="cancelPass"></sys:delRow></li>
|
||||
</ul>
|
||||
</div>
|
||||
</shiro:hasPermission>
|
||||
<%-- <shiro:hasPermission name="cfg:audit">
|
||||
<button type="button" class="btn btn-default" onclick="auditCfg(1)">
|
||||
<i class="fa fa-check"></i> <spring:message code="approved"/> </button>
|
||||
<button type="button" class="btn btn-default" onclick="auditCfg(2)">
|
||||
<i class="fa fa-remove"></i> <spring:message code="unapproved"/> </button>
|
||||
<button type="button" class="btn btn-default" onclick="auditCfg(3)">
|
||||
<i class="fa fa-undo"></i> <spring:message code="cancel"/> </button>
|
||||
</shiro:hasPermission> --%>
|
||||
</c:if>
|
||||
<a class="btn btn-icon-only btn-default setfields tooltips"
|
||||
data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
|
||||
<i class="icon-wrench"></i>
|
||||
@@ -249,6 +310,7 @@
|
||||
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
|
||||
<thead>
|
||||
<tr>
|
||||
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
|
||||
<th><spring:message code="config_describe"/></th>
|
||||
<th><spring:message code="protocol_id"/></th>
|
||||
<th><spring:message code="protocol_name"/></th>
|
||||
@@ -278,6 +340,9 @@
|
||||
<tbody>
|
||||
<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
|
||||
<tr>
|
||||
<td>
|
||||
<input type="checkbox" class="i-checks" id="${cfg.cfgId}" value="${cfg.isAudit}">
|
||||
</td>
|
||||
<td>${cfg.cfgDesc }</td>
|
||||
<td>${cfg.appId }</td>
|
||||
<td>${cfg.appName }</td>
|
||||
@@ -364,7 +429,7 @@
|
||||
<li><a href="${ctx}/cfg/app/updateForm?serviceId=${cfg.serviceId}&action=${cfg.action}&compileId=${cfg.compileId}&cfgId=${cfg.cfgId}&cfgName=${cfgName}" onclick="javascript:return confirm('sure？', this.href)"><spring:message code="edit"></spring:message></a></li>
|
||||
</shiro:hasPermission>
|
||||
<shiro:hasPermission name="cfg:delete">
|
||||
<li><a href="${ctx}/cfg/app/deleteCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&compileId=${cfg.compileId}&cfgId=${cfg.cfgId}&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="delete"></spring:message></a></li>
|
||||
<li><a href="${ctx}/cfg/app/deleteCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&compileId=${cfg.compileId}&ids=${cfg.cfgId}&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="delete"></spring:message></a></li>
|
||||
</shiro:hasPermission>
|
||||
</c:when>
|
||||
</c:choose>
|
||||
@@ -372,16 +437,16 @@
|
||||
<c:if test="${audit==1}">
|
||||
<c:choose>
|
||||
<c:when test="${cfg.isAudit eq '1'}">
|
||||
<shiro:hasPermission name="cfg:audit:cancel">
|
||||
<li><a href="${ctx}/cfg/app/auditCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&compileId=${cfg.compileId}&cfgId=${cfg.cfgId}&isAudit=3&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="cancel"></spring:message></a></li>
|
||||
<shiro:hasPermission name="cfg:audit">
|
||||
<li><a href="${ctx}/cfg/app/auditCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&compileId=${cfg.compileId}&ids=${cfg.cfgId}&auditState=3&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="cancel"></spring:message></a></li>
|
||||
</shiro:hasPermission>
|
||||
</c:when>
|
||||
<c:when test="${cfg.isAudit eq '0'}">
|
||||
<shiro:hasPermission name="cfg:audit:valid">
|
||||
<li><a href="${ctx}/cfg/app/auditCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&compileId=${cfg.compileId}&cfgId=${cfg.cfgId}&isAudit=1&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="approved"></spring:message></a></li>
|
||||
<shiro:hasPermission name="cfg:audit">
|
||||
<li><a href="${ctx}/cfg/app/auditCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&compileId=${cfg.compileId}&ids=${cfg.cfgId}&auditState=1&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="approved"></spring:message></a></li>
|
||||
</shiro:hasPermission>
|
||||
<shiro:hasPermission name="cfg:audit:invalid">
|
||||
<li><a href="${ctx}/cfg/app/auditCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&compileId=${cfg.compileId}&cfgId=${cfg.cfgId}&isAudit=2&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="unapproved"></spring:message></a></li>
|
||||
<shiro:hasPermission name="cfg:audit">
|
||||
<li><a href="${ctx}/cfg/app/auditCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&compileId=${cfg.compileId}&ids=${cfg.cfgId}&auditState=2&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="unapproved"></spring:message></a></li>
|
||||
</shiro:hasPermission>
|
||||
</c:when>
|
||||
</c:choose>
|
||||
|
||||
Reference in New Issue
Block a user