Skip to content

Commit

Permalink
Merge branch 'dev' into feature/file_upload
Browse files Browse the repository at this point in the history
  • Loading branch information
@sunjun-qima
sunjun-qima committed Sep 27, 2016
2 parents 24aeefe + 3d6c54d commit 17c37ed
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/main/webapp/WEB-INF/views/caselist/AllCaselist.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@
<td>
<sec:authorize access="isAuthenticated()">
<sec:authentication property="principal.account" var="account" />
<c:if test="${account.role == 'cs' || account.role == 'admin'}">
<c:if test="${account.role == 'kf' || account.role == 'cs' || account.role == 'admin'}">
<input type = "checkbox" name = "caseids" value = "${caselist.caseid}" />
</c:if>
<c:if test="${account.role != 'cs' && account.role != 'admin'}">
<c:if test="${account.role != 'kf' && account.role != 'cs' && account.role != 'admin'}">
<input type = "checkbox" name = "caseids" value = "${caselist.caseid}" disabled />
</c:if>
</sec:authorize>
Expand All @@ -76,7 +76,7 @@

<sec:authorize access="isAuthenticated()">
<sec:authentication property="principal.account" var="account" />
<c:if test="${account.role == 'cs' || account.role == 'admin'}">
<c:if test="${account.role == 'kf' || account.role == 'cs' || account.role == 'admin'}">
<button class="btn btn-lg btn-primary btn-block" type="submit">分配</button>
</c:if>
</sec:authorize>
Expand Down

0 comments on commit 17c37ed

Please sign in to comment.