1、文件样例配置审核通过后，删除本地文件；2、修正配置列表时间查询条件与排序设置。
This commit is contained in:
zhangwei
@@ -282,11 +282,11 @@
|
||||
<th><spring:message code="valid_identifier"/></th>
|
||||
<th><spring:message code="is_audit"/></th>
|
||||
<th><spring:message code="creator"/></th>
|
||||
<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
|
||||
<th class="sort-column a.create_time"><spring:message code="config_time"/></th>
|
||||
<th><spring:message code="editor"/></th>
|
||||
<th class="sort-column r.edit_time"><spring:message code="edit_time"/></th>
|
||||
<th class="sort-column a.edit_time"><spring:message code="edit_time"/></th>
|
||||
<th><spring:message code="auditor"/></th>
|
||||
<th class="sort-column r.audit_time"><spring:message code="audit_time"/></th>
|
||||
<th class="sort-column a.audit_time"><spring:message code="audit_time"/></th>
|
||||
<%-- <th><spring:message code="operation"></spring:message></th> --%>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
@@ -117,11 +117,11 @@
|
||||
<button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/> <i class="fa fa-angle-double-down"></i></button>
|
||||
</div>
|
||||
<div class="pull-right">
|
||||
<shiro:hasPermission name="avFileSample:config">
|
||||
<shiro:hasPermission name="avSignSample:config">
|
||||
<sys:delRow url="${ctx}/ntc/av/sample/signSampleForm" id="contentTable" label="update"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/ntc/av/sample/updateAvSignSampleValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
|
||||
</shiro:hasPermission>
|
||||
<shiro:hasPermission name="avFileSample:audit">
|
||||
<shiro:hasPermission name="avSignSample: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>
|
||||
@@ -285,11 +285,11 @@
|
||||
<th><spring:message code="valid_identifier"/></th>
|
||||
<th><spring:message code="is_audit"/></th>
|
||||
<th><spring:message code="creator"/></th>
|
||||
<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
|
||||
<th class="sort-column a.create_time"><spring:message code="config_time"/></th>
|
||||
<th><spring:message code="editor"/></th>
|
||||
<th class="sort-column r.edit_time"><spring:message code="edit_time"/></th>
|
||||
<th class="sort-column a.edit_time"><spring:message code="edit_time"/></th>
|
||||
<th><spring:message code="auditor"/></th>
|
||||
<th class="sort-column r.audit_time"><spring:message code="audit_time"/></th>
|
||||
<th class="sort-column a.audit_time"><spring:message code="audit_time"/></th>
|
||||
<%-- <th><spring:message code="operation"></spring:message></th> --%>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
@@ -9,7 +9,7 @@ if (Servlets.isAjaxRequest(request)) {
|
||||
if (ex!=null && StringUtils.startsWith(ex.getMessage(), "msg:")){
|
||||
out.print(StringUtils.replace(ex.getMessage(), "msg:", ""));
|
||||
}else{
|
||||
out.print("操作权限不足.");
|
||||
out.print("<spring:message code=\"no_permission\"/>.");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,90 +1,141 @@
|
||||
<%@ page contentType="text/html;charset=UTF-8" %>
|
||||
<%@ page contentType="text/html;charset=UTF-8"%>
|
||||
<%@ include file="/WEB-INF/include/taglib.jsp"%>
|
||||
<html>
|
||||
<head>
|
||||
<title>菜单管理</title>
|
||||
<title>菜单管理</title>
|
||||
|
||||
<link href="${ctxStatic}/global/plugins/treeTable/themes/vsStyle/treeTable.min.css" rel="stylesheet" type="text/css" />
|
||||
<script src="${ctxStatic}/global/plugins/treeTable/jquery.treeTable.min.js" type="text/javascript"></script>
|
||||
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function() {
|
||||
$("#treeTable").treeTable({expandLevel : 3}).show();
|
||||
});
|
||||
function updateSort() {
|
||||
loading('正在提交，请稍等...');
|
||||
$("#listForm").attr("action", "${ctx}/sys/menu/updateSort");
|
||||
$("#listForm").submit();
|
||||
}
|
||||
</script>
|
||||
<link
|
||||
href="${ctxStatic}/global/plugins/treeTable/themes/vsStyle/treeTable.min.css"
|
||||
rel="stylesheet" type="text/css" />
|
||||
<script
|
||||
src="${ctxStatic}/global/plugins/treeTable/jquery.treeTable.min.js"
|
||||
type="text/javascript"></script>
|
||||
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function() {
|
||||
$("#treeTable").treeTable({
|
||||
expandLevel : 3
|
||||
}).show();
|
||||
});
|
||||
function updateSort() {
|
||||
loading('正在提交，请稍等...');
|
||||
$("#listForm").attr("action", "${ctx}/sys/menu/updateSort");
|
||||
$("#listForm").submit();
|
||||
}
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div class="page-content">
|
||||
<div class="theme-panel hidden-xs hidden-sm">
|
||||
|
||||
<shiro:hasPermission name="sys:menu:edit"><button type="button" class="btn btn-primary"
|
||||
onClick="javascript:window.location='${ctx}/sys/menu/form'"> <spring:message code="add"/> </button></shiro:hasPermission>
|
||||
|
||||
<shiro:hasPermission name="sys:menu:edit">
|
||||
<button type="button" class="btn btn-primary"
|
||||
onClick="javascript:window.location='${ctx}/sys/menu/form'">
|
||||
|
||||
<spring:message code="add" />
|
||||
|
||||
</button>
|
||||
</shiro:hasPermission>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<h3 class="page-title">
|
||||
<spring:message code="menuManage"/>
|
||||
<small><spring:message code="date_list"/></small>
|
||||
<spring:message code="menuManage" />
|
||||
<small><spring:message code="date_list" /></small>
|
||||
</h3>
|
||||
|
||||
|
||||
<h5 class="page-header"></h5>
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="portlet">
|
||||
|
||||
<div class="portlet-body">
|
||||
|
||||
<div class="row" >
|
||||
|
||||
<div class="col-md-12">
|
||||
|
||||
<sys:message content="${message}"/>
|
||||
|
||||
<div class="row">
|
||||
|
||||
<div class="col-md-12">
|
||||
|
||||
<sys:message content="${message}" />
|
||||
<form id="listForm" method="post">
|
||||
<table id="treeTable" class="table table-striped table-bordered table-condensed">
|
||||
<thead><tr><th><spring:message code="menu_name"/></th><th><spring:message code="unicode"/></th><th><spring:message code="link"/></th><th style="text-align:center;"><spring:message code="sort"/></th><th><spring:message code="visible"/></th><th><spring:message code="permission_mark"/></th><shiro:hasPermission name="sys:menu:edit"><th><spring:message code="operation"/></th></shiro:hasPermission></tr></thead>
|
||||
<tbody><c:forEach items="${list}" var="menu">
|
||||
<tr id="${menu.id}" pId="${menu.parent.id ne 1?menu.parent.id:0}">
|
||||
<td nowrap><i class="${not empty menu.icon?menu.icon:' hide'} font-blue-sharp"></i> <a href="${ctx}/sys/menu/form?id=${menu.id}">${menu.name}</a></td>
|
||||
<td>${menu.code}</td>
|
||||
<td title="${menu.href}">${fns:abbr(menu.href,30)}</td>
|
||||
<td style="text-align:center;">
|
||||
<shiro:hasPermission name="sys:menu:edit">
|
||||
<input type="hidden" name="ids" value="${menu.id}"/>
|
||||
<input name="sorts" type="text" value="${menu.sort}" style="width:50px;margin:0;padding:0;text-align:center;border: 1px solid #ddd;">
|
||||
</shiro:hasPermission><shiro:lacksPermission name="sys:menu:edit">
|
||||
${menu.sort}
|
||||
</shiro:lacksPermission>
|
||||
</td>
|
||||
<td><c:choose><c:when test="${menu.isShow eq '1'}"><spring:message code="display"/></c:when><c:otherwise><spring:message code="hide"/></c:otherwise></c:choose></td>
|
||||
<td title="${menu.permission}">${fns:abbr(menu.permission,30)}</td>
|
||||
<shiro:hasPermission name="sys:menu:edit"><td nowrap>
|
||||
<a href="${ctx}/sys/menu/form?id=${menu.id}"><spring:message code="edit"/></a>
|
||||
<a href="${ctx}/sys/menu/delete?id=${menu.id}" onclick="return confirmx('<spring:message code="delete_all_child"/>', this.href)"><spring:message code="delete"/></a>
|
||||
<a href="${ctx}/sys/menu/form?parent.id=${menu.id}"><spring:message code="add_child_menu"></spring:message></a>
|
||||
</td></shiro:hasPermission>
|
||||
<table id="treeTable"
|
||||
class="table table-striped table-bordered table-condensed">
|
||||
<thead>
|
||||
<tr>
|
||||
<th><spring:message code="menu_name" /></th>
|
||||
<th><spring:message code="unicode" /></th>
|
||||
<th><spring:message code="functionId" /></th>
|
||||
<th><spring:message code="link" /></th>
|
||||
<th style="text-align:center;"><spring:message
|
||||
code="sort" /></th>
|
||||
<th><spring:message code="visible" /></th>
|
||||
<th><spring:message code="permission_mark" /></th>
|
||||
<shiro:hasPermission name="sys:menu:edit">
|
||||
<th><spring:message code="operation" /></th>
|
||||
</shiro:hasPermission>
|
||||
</tr>
|
||||
</c:forEach></tbody>
|
||||
</thead>
|
||||
<tbody>
|
||||
<c:forEach items="${list}" var="menu">
|
||||
<tr id="${menu.id}"
|
||||
pId="${menu.parent.id ne 1?menu.parent.id:0}">
|
||||
<td nowrap><i
|
||||
class="${not empty menu.icon?menu.icon:' hide'} font-blue-sharp"></i>
|
||||
<a href="${ctx}/sys/menu/form?id=${menu.id}">${menu.name}</a></td>
|
||||
<td>${menu.code}</td>
|
||||
<td>${menu.functionId}</td>
|
||||
<td title="${menu.href}">${fns:abbr(menu.href,30)}</td>
|
||||
<td style="text-align:center;"><shiro:hasPermission
|
||||
name="sys:menu:edit">
|
||||
<input type="hidden" name="ids" value="${menu.id}" />
|
||||
<input name="sorts" type="text" value="${menu.sort}"
|
||||
style="width:50px;margin:0;padding:0;text-align:center;border: 1px solid #ddd;">
|
||||
</shiro:hasPermission>
|
||||
<shiro:lacksPermission name="sys:menu:edit">
|
||||
${menu.sort}
|
||||
</shiro:lacksPermission></td>
|
||||
<td><c:choose>
|
||||
<c:when test="${menu.isShow eq '1'}">
|
||||
<spring:message code="display" />
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<spring:message code="hide" />
|
||||
</c:otherwise>
|
||||
</c:choose></td>
|
||||
<td title="${menu.permission}">${fns:abbr(menu.permission,30)}</td>
|
||||
<shiro:hasPermission name="sys:menu:edit">
|
||||
<td nowrap><a
|
||||
href="${ctx}/sys/menu/form?id=${menu.id}"><spring:message
|
||||
code="edit" /></a> <a
|
||||
href="${ctx}/sys/menu/delete?id=${menu.id}"
|
||||
onclick="return confirmx('<spring:message code="delete_all_child"/>', this.href)"><spring:message
|
||||
code="delete" /></a> <a
|
||||
href="${ctx}/sys/menu/form?parent.id=${menu.id}"><spring:message
|
||||
code="add_child_menu"></spring:message></a></td>
|
||||
</shiro:hasPermission>
|
||||
</tr>
|
||||
</c:forEach>
|
||||
</tbody>
|
||||
</table>
|
||||
<shiro:hasPermission name="sys:menu:edit"><div class="form-actions pagination-left">
|
||||
<button id="btnSubmit" class="btn btn-primary" type="button" onclick="updateSort();"><spring:message code="save_sort"/></button>
|
||||
</div></shiro:hasPermission>
|
||||
</form>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<shiro:hasPermission name="sys:menu:edit">
|
||||
<div class="form-actions pagination-left">
|
||||
<button id="btnSubmit" class="btn btn-primary" type="button"
|
||||
onclick="updateSort();">
|
||||
<spring:message code="save_sort" />
|
||||
</button>
|
||||
</div>
|
||||
</shiro:hasPermission>
|
||||
</form>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
Reference in New Issue
Block a user