diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-08-10 17:19:25 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-08-10 17:19:25 +0000 |
commit | c4798bc4cd5ca6734b5918cef141159c4dfa6876 (patch) | |
tree | b32fd711a5cf451a576bd57ac8520981fadc5df1 /src/main | |
parent | e28a98dca1be68db50fe83deb5d2dc377087b672 (diff) | |
parent | 1be3c533ae06a72a1f2c301a41b4bb0ea79c4e43 (diff) | |
download | dashboard-c4798bc4cd5ca6734b5918cef141159c4dfa6876.tar.gz |
Merge "The existing code coverage path is corrupted"
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/java/com/android/vts/entity/CoverageEntity.java | 4 | ||||
-rw-r--r-- | src/main/webapp/WEB-INF/jsp/show_coverage.jsp | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/com/android/vts/entity/CoverageEntity.java b/src/main/java/com/android/vts/entity/CoverageEntity.java index 3fa69fd..bfc7041 100644 --- a/src/main/java/com/android/vts/entity/CoverageEntity.java +++ b/src/main/java/com/android/vts/entity/CoverageEntity.java @@ -176,9 +176,9 @@ public class CoverageEntity implements Serializable { */ public String getGerritUrl() throws UnsupportedEncodingException { String gerritPath = GERRIT_URI + "/projects/" + - projectName + "/commits/" + + URLEncoder.encode(projectName, "UTF-8") + "/commits/" + URLEncoder.encode(projectVersion, "UTF-8") + "/files/" + - filePath; + URLEncoder.encode(filePath, "UTF-8") + "/content"; return gerritPath; } diff --git a/src/main/webapp/WEB-INF/jsp/show_coverage.jsp b/src/main/webapp/WEB-INF/jsp/show_coverage.jsp index ea163ae..a1a38f5 100644 --- a/src/main/webapp/WEB-INF/jsp/show_coverage.jsp +++ b/src/main/webapp/WEB-INF/jsp/show_coverage.jsp @@ -103,10 +103,10 @@ if (prev.length > 0) { prev.find('.table-container').empty(); } - var url = self.parent().attr('url'); - var i = self.parent().attr('index'); + var url = self.parent().data('url'); var container = self.parent().find('.table-container'); container.html('<div class="center-align">Loading...</div>'); + var coverageVectors = self.parent().data('coverage'); if (self.parent().hasClass('active')) { // Remove the code from display container.empty(); @@ -128,7 +128,7 @@ total = 0; var table = $('<table class="table"></table>'); var rows = srcLines.forEach(function(line, j) { - var count = coverageVectors[i][j]; + var count = coverageVectors[j]; var row = $('<tr></tr>'); if (typeof count == 'undefined' || count < 0) { count = "--"; @@ -170,10 +170,10 @@ <h4 class="section-title"><b>Coverage:</b> </h4> <ul class="collapsible popout" data-collapsible="accordion"> <c:forEach var="coverageEntity" items="${coverageEntityList}" varStatus="loop"> - <li url="<c:url value="${coverageEntity.gerritUrl}"/>" data-index="${loop.index}"> + <li data-url="<c:url value="${coverageEntity.gerritUrl}"/>" data-index="${loop.index}" data-coverage="${coverageEntity.lineCoverage}"> <div class="collapsible-header <c:out value='${coverageEntity.isIgnored ? "grey" : ""}'/>"> <i class="material-icons">library_books</i> - <div class="truncate"><b>${coverageEntity.projectName}</b>${coverageEntity.filePath}</div> + <div class="truncate"><b>${coverageEntity.projectName}</b>/${coverageEntity.filePath}</div> <div class="right total-count">${coverageEntity.coveredCount}/${coverageEntity.totalCount}</div> <div class="indicator ${coverageEntity.percentage >= 70 ? "green" : "red"}">${coverageEntity.percentage}%</div> <c:if test="${isModerator}"> |