commit 533e9bbbd83034d6fa8defdca14699f907822114
author Young Gyu Park <younggyu@google.com> Wed Feb 21 04:52:51 2018 +0000
committer android-build-merger <android-build-merger@google.com> Wed Feb 21 04:52:51 2018 +0000
tree ded981dbecd9dd21a4347f6202fe9ac1db3007ed
parent 048da815b176e7195a661d44994b9b85a25038fb
parent 279351d2a4cdcadb75a8e30be5b4f83eab2c7703

Adding Green Build Button on release page. am: 2f97c8e745 am: e971738668
am: 279351d2a4

Change-Id: I280c571efca9298f81216c6b0da14bd417d9719f

src/main/java/com/android/vts/servlet/ShowReleaseServlet.java

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.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 @@
     @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 @@
         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) {

src/main/webapp/WEB-INF/jsp/show_release.jsp

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>