Skip to content

Commit 4406f61

Browse files
author
Marcelo Vanzin
committed
Cosmetic change to listing header.
1 parent e852149 commit 4406f61

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

core/src/main/scala/org/apache/spark/deploy/history/HistoryPage.scala

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,19 @@ private[spark] class HistoryPage(parent: HistoryServer) extends WebUIPage("") {
3030
def render(request: HttpServletRequest): Seq[Node] = {
3131
val requestedPage = Option(request.getParameter("page")).getOrElse("1").toInt
3232
val requestedFirst = (requestedPage - 1) * pageSize
33-
val (apps, actualFirst, count) = parent.getApplicationList(requestedFirst, pageSize)
33+
val (apps, actualFirst, totalCount) = parent.getApplicationList(requestedFirst, pageSize)
3434
val actualPage = (actualFirst / pageSize) + 1
35-
val last = Math.min(actualFirst + pageSize, count) - 1
36-
val pageCount = count / pageSize + (if (count % pageSize > 0) 1 else 0)
35+
val last = Math.min(actualFirst + pageSize, totalCount) - 1
36+
val pageCount = totalCount / pageSize + (if (totalCount % pageSize > 0) 1 else 0)
3737

3838
val appTable = UIUtils.listingTable(appHeader, appRow, apps)
3939
val content =
4040
<div class="row-fluid">
4141
<div class="span12">
4242
{
43-
if (count > 0) {
43+
if (totalCount > 0) {
4444
<h4>
45-
Showing {actualFirst + 1}-{last + 1} of {count}
46-
Application{if (last - actualFirst > 1) "s" else ""}
45+
Showing {actualFirst + 1}-{last + 1} of {totalCount}
4746
<span style="float: right">
4847
{if (actualPage > 1) <a href={"/?page=" + (actualPage - 1)}>&lt;</a>}
4948
{if (actualPage < pageCount) <a href={"/?page=" + (actualPage + 1)}>&gt;</a>}

0 commit comments

Comments
 (0)