Merge pull request #72 from diging/develop

[bugfix] fixed Staff role issue and Maven variable name issue
diging · May 14, 2019 · af2e84d · af2e84d
2 parents c7a88c7 + 3c93359
commit af2e84d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/images/imagelist.jsp b/vspace/src/main/webapp/WEB-INF/views/staff/images/imagelist.jsp
@@ -103,9 +103,9 @@ $( document ).ready(function() {
                                     <option>Assign a tag</option>
                                     <c:forEach
                                         items="${imageCategories}"
-                                        var="tag">
-                                        <option value="${tag}"><spring:eval
-                                                expression="@configFile.getProperty('image_category_' + tag)" /></option>
+                                        var="catTag">
+                                        <option value="${catTag}"><spring:eval
+                                                expression="@configFile.getProperty('image_category_' + catTag)" /></option>
                                     </c:forEach>
                                 </select>
                             </form></td>

diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/users/list.jsp b/vspace/src/main/webapp/WEB-INF/views/staff/users/list.jsp
@@ -35,13 +35,13 @@
             </c:if>
 
             <c:if test="${not fn:contains(user.roles, 'STAFF')}">
-		        <c:url value="/staff/user/${user.username}/role/add?roles=STAFF" var="url"/>
+		        <c:url value="/staff/user/${user.username}/role/add?roles=ROLE_STAFF" var="url"/>
 	            <form:form action="${url}" method="POST">
 	            <button style="padding:0px" class="btn btn-link"><span data-feather="user"></span> Make Staff</button>
 	            </form:form>
 	        </c:if>
             <c:if test="${fn:contains(user.roles, 'STAFF')}">
-	            <c:url value="/staff/user/${user.username}/role/remove?roles=STAFF" var="url"/>
+	            <c:url value="/staff/user/${user.username}/role/remove?roles=ROLE_STAFF" var="url"/>
 		        <form:form action="${url}" method="POST">
 	            <button style="padding:0px" class="btn btn-link"><span data-feather="user"></span> Remove Staff Role</button>
 	            </form:form>