diff options
author | Young Gyu Park <younggyu@google.com> | 2018-04-18 16:19:57 +0900 |
---|---|---|
committer | Young Gyu Park <younggyu@google.com> | 2018-04-18 17:18:56 +0900 |
commit | d32eb9559b034b40ea3745ee20dd23f4d9fec91d (patch) | |
tree | 5f6cf47b99130e898a0a99f4dbf653b36e120fe5 /src/main/java | |
parent | 0cef205aaa74773e2fd493ee711b001caf9ad8b1 (diff) | |
download | dashboard-d32eb9559b034b40ea3745ee20dd23f4d9fec91d.tar.gz |
Adding log link to result log path to show GCS log
Test: go/vts-web-staging/show_plan_release?plan=vts&type=suite&page=1
Bug: 77456536
Change-Id: Iee07041ed09c54bb17276988ebbc226709010b9b
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/com/android/vts/servlet/BaseServlet.java | 6 | ||||
-rw-r--r-- | src/main/java/com/android/vts/servlet/ShowPlanReleaseServlet.java | 14 |
2 files changed, 16 insertions, 4 deletions
diff --git a/src/main/java/com/android/vts/servlet/BaseServlet.java b/src/main/java/com/android/vts/servlet/BaseServlet.java index 93652b4..14983cc 100644 --- a/src/main/java/com/android/vts/servlet/BaseServlet.java +++ b/src/main/java/com/android/vts/servlet/BaseServlet.java @@ -86,6 +86,12 @@ public abstract class BaseServlet extends HttpServlet { this.url = type.defaultUrl + url; } + public Page(PageType type, String name, String url, Boolean withoutDefault) { + this.type = type; + this.name = name; + this.url = type.defaultUrl + url; + } + public Page(PageType type, String url) { this.type = type; this.name = type.defaultName; diff --git a/src/main/java/com/android/vts/servlet/ShowPlanReleaseServlet.java b/src/main/java/com/android/vts/servlet/ShowPlanReleaseServlet.java index e0d7509..69c75f1 100644 --- a/src/main/java/com/android/vts/servlet/ShowPlanReleaseServlet.java +++ b/src/main/java/com/android/vts/servlet/ShowPlanReleaseServlet.java @@ -55,9 +55,17 @@ public class ShowPlanReleaseServlet extends BaseServlet { @Override public List<Page> getBreadcrumbLinks(HttpServletRequest request) { + String testType = + request.getParameter("type") == null ? "plan" : request.getParameter("type"); List<Page> links = new ArrayList<>(); String planName = request.getParameter("plan"); - links.add(new Page(PageType.PLAN_RELEASE, planName, "?plan=" + planName)); + if (testType.equals("plan")) { + links.add(new Page(PageType.RELEASE, "TEST PLANS", "?type=" + testType, true)); + links.add(new Page(PageType.PLAN_RELEASE, planName, "?plan=" + planName)); + } else { + links.add(new Page(PageType.RELEASE, "SUITE TEST PLANS", "?type=" + testType, true)); + links.add(new Page(PageType.PLAN_RELEASE, planName, "?plan=" + planName + "&type=" + testType)); + } return links; } @@ -301,9 +309,7 @@ public class ShowPlanReleaseServlet extends BaseServlet { pageCountTokenSet); String nextPageTokenPagination = testSuiteResultEntityPagination.getNextPageCountToken(); - if (nextPageTokenPagination == "") { - - } else { + if (!nextPageTokenPagination.trim().isEmpty()) { this.pageCountTokenSet.add(nextPageTokenPagination); } |