Merge branch 'develop_no_common_group' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop_no_common_group
This commit is contained in:
@@ -233,7 +233,7 @@ $(document).ready(function(){
|
|||||||
<th class="sort-column entrance_id" isVisible="false" column="entrance_id"><spring:message code="entrance_id"/></th>
|
<th class="sort-column entrance_id" isVisible="false" column="entrance_id"><spring:message code="entrance_id"/></th>
|
||||||
|
|
||||||
<th class="sort-column ftp_url" column="ftp_url"><spring:message code='ftp_url'/></th>
|
<th class="sort-column ftp_url" column="ftp_url"><spring:message code='ftp_url'/></th>
|
||||||
<th class="sort-column ftp_content" column="ftp_content"><spring:message code='ftp_content'/></th>
|
<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column ftp_content" column="ftp_content"><spring:message code='ftp_content'/></th></c:if>
|
||||||
|
|
||||||
<th class="sort-column cap_ip" isVisible="false" column="clj_ip"><spring:message code="clj_ip"/></th>
|
<th class="sort-column cap_ip" isVisible="false" column="clj_ip"><spring:message code="clj_ip"/></th>
|
||||||
<th class="sort-column trans_proto" column="transport_layer_protocol"><spring:message code="transport_layer_protocol"/></th>
|
<th class="sort-column trans_proto" column="transport_layer_protocol"><spring:message code="transport_layer_protocol"/></th>
|
||||||
@@ -310,10 +310,10 @@ $(document).ready(function(){
|
|||||||
</a>
|
</a>
|
||||||
</c:if> --%>
|
</c:if> --%>
|
||||||
</td>
|
</td>
|
||||||
|
<c:if test="${fns:getUser().isAdmin()}">
|
||||||
<td>
|
<td>
|
||||||
${log.ftpContent}
|
${log.ftpContent}
|
||||||
</td>
|
</td></c:if>
|
||||||
<td >${log.capIp}</td>
|
<td >${log.capIp}</td>
|
||||||
<td>
|
<td>
|
||||||
<c:set var="transProtos">${log.transProto }</c:set>
|
<c:set var="transProtos">${log.transProto }</c:set>
|
||||||
|
|||||||
Reference in New Issue
Block a user