From 3b8326d5bd720dc18a9ac3e50847f858df062b61 Mon Sep 17 00:00:00 2001
From: Young Gyu Park <younggyu@google.com>
Date: Tue, 8 May 2018 11:45:53 +0900
Subject: Fix parameter bug for multiple type categories

Test: go/vts-web-staging/show_plan_release?plan=vts&type=suite&page=1
Bug: 78661101
Change-Id: Ie87ac09608b460e1a7db1a72d8daaae4c1f0305e
---
 src/main/webapp/WEB-INF/datastore-indexes.xml      | 18 ++++++++++++++++++
 src/main/webapp/WEB-INF/jsp/show_suite_release.jsp |  6 +++---
 2 files changed, 21 insertions(+), 3 deletions(-)

(limited to 'src/main/webapp')

diff --git a/src/main/webapp/WEB-INF/datastore-indexes.xml b/src/main/webapp/WEB-INF/datastore-indexes.xml
index 0f9caf1..4b1c6cc 100644
--- a/src/main/webapp/WEB-INF/datastore-indexes.xml
+++ b/src/main/webapp/WEB-INF/datastore-indexes.xml
@@ -113,6 +113,24 @@
     <property name="__key__" direction="desc"/>
   </datastore-index>
 
+  <datastore-index kind="TestSuiteResultEntity" ancestor="false" source="manual">
+    <property name="suitePlan" direction="asc"/>
+    <property name="testTypeIndex.TOT" direction="asc"/>
+    <property name="__key__" direction="desc"/>
+  </datastore-index>
+
+  <datastore-index kind="TestSuiteResultEntity" ancestor="false" source="manual">
+    <property name="suitePlan" direction="asc"/>
+    <property name="testTypeIndex.OTA" direction="asc"/>
+    <property name="__key__" direction="desc"/>
+  </datastore-index>
+
+  <datastore-index kind="TestSuiteResultEntity" ancestor="false" source="manual">
+    <property name="suitePlan" direction="asc"/>
+    <property name="testTypeIndex.SIGNED" direction="asc"/>
+    <property name="__key__" direction="desc"/>
+  </datastore-index>
+
   <datastore-index kind="TestSuiteResultEntity" ancestor="false" source="manual">
     <property name="suitePlan" direction="asc"/>
     <property name="branch" direction="asc"/>
diff --git a/src/main/webapp/WEB-INF/jsp/show_suite_release.jsp b/src/main/webapp/WEB-INF/jsp/show_suite_release.jsp
index 4b8b9e8..da9d8da 100644
--- a/src/main/webapp/WEB-INF/jsp/show_suite_release.jsp
+++ b/src/main/webapp/WEB-INF/jsp/show_suite_release.jsp
@@ -231,7 +231,7 @@
             <c:choose>
                 <c:when test="${testSuiteResultEntityPagination.minPageRange gt testSuiteResultEntityPagination.pageSize}">
                     <li class="waves-effect">
-                        <a href="${requestScope['javax.servlet.forward.servlet_path']}?plan=${plan}&type=${testType}&groupType=${groupType}&page=${testSuiteResultEntityPagination.minPageRange - 1}&nextPageToken=${testSuiteResultEntityPagination.previousPageCountToken}">
+                        <a href="${requestScope['javax.servlet.forward.servlet_path']}?plan=${plan}&type=${testType}&testCategoryType=${testCategoryType}&page=${testSuiteResultEntityPagination.minPageRange - 1}&nextPageToken=${testSuiteResultEntityPagination.previousPageCountToken}">
                             <i class="material-icons">chevron_left</i>
                         </a>
                     </li>
@@ -242,7 +242,7 @@
             </c:choose>
             <c:forEach var="pageLoop" begin="${testSuiteResultEntityPagination.minPageRange}" end="${testSuiteResultEntityPagination.maxPageRange}">
               <li class="waves-effect<c:if test="${pageLoop eq page}"> active</c:if>">
-                  <a href="${requestScope['javax.servlet.forward.servlet_path']}?plan=${plan}&type=${testType}&groupType=${groupType}&page=${pageLoop}<c:if test="${testSuiteResultEntityPagination.currentPageCountToken ne ''}">&nextPageToken=${testSuiteResultEntityPagination.currentPageCountToken}</c:if>">
+                  <a href="${requestScope['javax.servlet.forward.servlet_path']}?plan=${plan}&type=${testType}&testCategoryType=${testCategoryType}&page=${pageLoop}<c:if test="${testSuiteResultEntityPagination.currentPageCountToken ne ''}">&nextPageToken=${testSuiteResultEntityPagination.currentPageCountToken}</c:if>">
                       <c:out value="${pageLoop}" />
                   </a>
               </li>
@@ -250,7 +250,7 @@
             <c:choose>
                 <c:when test="${testSuiteResultEntityPagination.maxPages gt testSuiteResultEntityPagination.pageSize}">
                     <li class="waves-effect">
-                        <a href="${requestScope['javax.servlet.forward.servlet_path']}?plan=${plan}&type=${testType}&groupType=${groupType}&page=${testSuiteResultEntityPagination.maxPageRange + 1}&nextPageToken=${testSuiteResultEntityPagination.nextPageCountToken}">
+                        <a href="${requestScope['javax.servlet.forward.servlet_path']}?plan=${plan}&type=${testType}&testCategoryType=${testCategoryType}&page=${testSuiteResultEntityPagination.maxPageRange + 1}&nextPageToken=${testSuiteResultEntityPagination.nextPageCountToken}">
                             <i class="material-icons">chevron_right</i>
                         </a>
                     </li>
-- 
cgit v1.2.3