diff options
| author | Young Gyu Park <younggyu@google.com> | 2018-05-08 11:45:53 +0900 |
|---|---|---|
| committer | Young Gyu Park <younggyu@google.com> | 2018-05-16 13:57:01 +0900 |
| commit | 3b8326d5bd720dc18a9ac3e50847f858df062b61 (patch) | |
| tree | 8ec8641800e4898ea51d97d68745dfa034524375 /src/main/webapp | |
| parent | 318e1e50229cbea128d19f956e6d2691cde27c72 (diff) | |
| download | dashboard-3b8326d5bd720dc18a9ac3e50847f858df062b61.tar.gz | |
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
Diffstat (limited to 'src/main/webapp')
| -rw-r--r-- | src/main/webapp/WEB-INF/datastore-indexes.xml | 18 | ||||
| -rw-r--r-- | src/main/webapp/WEB-INF/jsp/show_suite_release.jsp | 6 |
2 files changed, 21 insertions, 3 deletions
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 @@ -115,6 +115,24 @@ <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"/> <property name="target" direction="asc"/> </datastore-index> 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> |