Minor changes user list page

cypo721 · Jan 14, 2017 · 2f1b146 · 2f1b146
1 parent fcba9f2
commit 2f1b146
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/web/src/main/webapp/WEB-INF/jsp/user/list.jsp b/web/src/main/webapp/WEB-INF/jsp/user/list.jsp
@@ -10,8 +10,8 @@
 <div class="row">
  <br>
  <div>
- <a href="${pageContext.request.contextPath}/machine/new"
- class="btn btn-success">New machine</a>
+ <a href="${pageContext.request.contextPath}/user/new"
+ class="btn btn-success">New user</a>
  </div>
  <br>
  <table class=" table table-striped">
@@ -27,9 +27,9 @@
  <td><c:out value="${user.role}"/> [CZK]</td>
  <td><c:out value="${user.joinedDate}"/> </td>
  <td>
- <a href="${pageContext.request.contextPath}/machine/edit/${m.id}"
+ <a href="${pageContext.request.contextPath}/user/edit/${m.id}"
  class="btn btn-default">Edit</a>
- <a href="${pageContext.request.contextPath}/machine/delete/${m.id}"
+ <a href="${pageContext.request.contextPath}/user/delete/${m.id}"
  class="btn btn-danger">Delete</a>
  </td>
  </tr>
@@ -41,7 +41,7 @@
  <jsp:attribute name="script">
 <script>
  $(function () {
- $('#list-machines').on('change', function () {
+ $('#list-users').on('change', function () {
  var url = $(this).val();
  if (url) {
  window.location = url;

diff --git a/web/src/main/webapp/WEB-INF/tags/template.tag b/web/src/main/webapp/WEB-INF/tags/template.tag
@@ -57,7 +57,7 @@
  </sec:authorize>
  <li><a href="${pageContext.request.contextPath}/rental/list">Rentals</a></li>
  <sec:authorize access="hasAuthority('ADMIN') or hasAuthority('EMPLOYEE')">
- <li><a href="${pageContext.request.contextPath}/user/list">Users</a></li>
+ <li><a href="${pageContext.request.contextPath}/user/">Users</a></li>
  </sec:authorize>
  </ul>
  <ul class="nav navbar-nav navbar-right">