diff options
| -rw-r--r-- | src/main/java/com/android/vts/servlet/ShowReleaseServlet.java | 6 | ||||
| -rw-r--r-- | src/main/webapp/WEB-INF/jsp/show_release.jsp | 28 |
2 files changed, 26 insertions, 8 deletions
diff --git a/src/main/java/com/android/vts/servlet/ShowReleaseServlet.java b/src/main/java/com/android/vts/servlet/ShowReleaseServlet.java index 05df40f..d631161 100644 --- a/src/main/java/com/android/vts/servlet/ShowReleaseServlet.java +++ b/src/main/java/com/android/vts/servlet/ShowReleaseServlet.java @@ -21,6 +21,8 @@ import com.google.appengine.api.datastore.DatastoreService; import com.google.appengine.api.datastore.DatastoreServiceFactory; import com.google.appengine.api.datastore.Entity; import com.google.appengine.api.datastore.Query; +import com.google.appengine.api.users.UserServiceFactory; +import com.google.gson.Gson; import java.io.IOException; import java.util.ArrayList; import java.util.Comparator; @@ -50,7 +52,6 @@ public class ShowReleaseServlet extends BaseServlet { @Override public void doGetHandler(HttpServletRequest request, HttpServletResponse response) throws IOException { - RequestDispatcher dispatcher = null; DatastoreService datastore = DatastoreServiceFactory.getDatastoreService(); Set<String> planSet = new HashSet<>(); @@ -64,8 +65,9 @@ public class ShowReleaseServlet extends BaseServlet { plans.sort(Comparator.naturalOrder()); response.setStatus(HttpServletResponse.SC_OK); + request.setAttribute("isAdmin", UserServiceFactory.getUserService().isUserAdmin()); request.setAttribute("planNames", plans); - dispatcher = request.getRequestDispatcher(RELEASE_JSP); + RequestDispatcher dispatcher = request.getRequestDispatcher(RELEASE_JSP); try { dispatcher.forward(request, response); } catch (ServletException e) { diff --git a/src/main/webapp/WEB-INF/jsp/show_release.jsp b/src/main/webapp/WEB-INF/jsp/show_release.jsp index b3da353..99aec7f 100644 --- a/src/main/webapp/WEB-INF/jsp/show_release.jsp +++ b/src/main/webapp/WEB-INF/jsp/show_release.jsp @@ -30,13 +30,29 @@ </div> <div class='row' id='options'> <c:forEach items='${planNames}' var='plan'> - <div> - <a href='/show_plan_release?plan=${plan}'> - <div class='col s12 card hoverable option valign-wrapper waves-effect'> - <span class='entry valign'>${plan}</span> + <c:choose> + <c:when test="${isAdmin}"> + <div class="col s11 center"> + <a href='/show_plan_release?plan=${plan}'> + <div class='col s12 card hoverable option valign-wrapper waves-effect'> + <span class='entry valign'>${plan}</span> + </div> + </a> </div> - </a> - </div> + <div class="col s1 center btn-container" style="margin-top: 9px;"> + <a href='/show_green_release?plan=${plan}' class="waves-effect waves-light btn">Green</a> + </div> + </c:when> + <c:otherwise> + <div class="col s12 center"> + <a href='/show_plan_release?plan=${plan}'> + <div class='col s12 card hoverable option valign-wrapper waves-effect'> + <span class='entry valign'>${plan}</span> + </div> + </a> + </div> + </c:otherwise> + </c:choose> </c:forEach> </div> </div> |