Reverse sort order, disable (instead of hiding) inactive Pager buttons

Author: bodom0015

app/controllers/Files.scala

@@ -220,31 +220,28 @@ class Files @Inject() (
           }
         }
 
-
-
-        //val fileList = files.
-        val pager: Option[models.Pager] = dataset match {
-          case None => None
+        val pager: models.Pager = dataset match {
+          case None => Pager(None, None)
           case Some(dsId) => {
             datasets.get(new UUID(dsId)) match {
-              case None => None
+              case None => Pager(None, None)
               case Some(ds) => {
                 val lastIndex = ds.files.length - 1
                 val index = ds.files.indexOf(id)
 
                 // Set prevFile / nextFile, if applicable
                 if (index > 0 && index < lastIndex) {
-                  // Yields UUID of prevFile and nextFile
-                  Some(Pager(Some(ds.files(index - 1)), Some(ds.files(index + 1))))
+                  // Yields UUID of prevFile and nextFile respectively
+                  Pager(Some(ds.files(index + 1)), Some(ds.files(index - 1)))
                 }else if (index == 0 && index < lastIndex) {
                   // This is the first file in the list, but not the last
-                  Some(Pager(None, Some(ds.files(index + 1))))
+                  Pager(Some(ds.files(index + 1)), None)
                 } else if (index > 0 && index == lastIndex) {
                   // This is the last file in the list, but not the first
-                  Some(Pager(Some(ds.files(index - 1)), None))
+                  Pager(None, Some(ds.files(index - 1)))
                 } else {
                   // There is one item on the list, disable paging
-                  None
+                  Pager(None, None)
                 }
               }
             }

app/views/file.scala.html

@@ -6,7 +6,7 @@
 		rdfExported: Boolean,
 		extractionsStatus: Map[String, ExtractionGroup], outputFormats: Option[List[String]], spaceId: Option[String], access:String,
 		folderHierarchy: List[Folder], spaces:List[ProjectSpace], allDatasets: List[Dataset],
-		view_count: Int, view_date: java.util.Date, pager: Option[models.Pager])(implicit user: Option[models.User], request: RequestHeader)
+		view_count: Int, view_date: java.util.Date, pager: models.Pager)(implicit user: Option[models.User], request: RequestHeader)
 
 @import helper._
 @import play.api.Play.current
@@ -198,44 +198,43 @@
 					@** Only enable paging when viewing from a dataset? *@
 					@if(allDatasets.length == 1) {
 						@allDatasets.map { ds =>
-							@pager match {
-								case None => {}
-								case Some(pg) => {
-									<div class="row bottom-padding">
-										<div class="col-sm-12 col-md-12 col-lg-12">
-											@pg.prev match {
-												case None => {}
-												case Some(prev) => {
-													<a class="btn btn-sm btn-link" style="border-radius:15px;border-color:lightgray;" href="@routes.Files.file(prev, if(datasets.length > 0) {
-														Some(datasets.head.id.stringify)
-													} else {
-														None
-													}, spaceId, if(folders.length > 0) {
-														Some(folders.head.id.stringify)
-													} else {
-														None
-													})"><i class="glyphicon glyphicon-chevron-left"></i> Prev</a>
-												}
-											}
-											@pg.next match {
-												case None => {}
-												case Some(next) => {
-													<a class="btn btn-sm btn-link" style="border-radius:15px;border-color:lightgray;" href="@routes.Files.file(next, if(datasets.length > 0) {
-														Some(datasets.head.id.stringify)
-													} else {
-														None
-													}, spaceId, if(folders.length > 0) {
-														Some(folders.head.id.stringify)
-													} else {
-														None
-													})">Next <i class="glyphicon glyphicon-chevron-right"></i></a>
-												}
-											}
+							<div class="row bottom-padding">
+								<div class="col-sm-12 col-md-12 col-lg-12">
+									@pager.prev match {
+										case None => {
+											<button class="btn btn-sm btn-link disabled" disabled="true" style="cursor:not-allowed;border-radius:15px;border-color:lightgray;"><i class="glyphicon glyphicon-chevron-left"></i> Prev</button>
+										}
+										case Some(prev) => {
+											<a class="btn btn-sm btn-link" style="border-radius:15px;border-color:lightgray;" href="@routes.Files.file(prev, if(datasets.length > 0) {
+												Some(datasets.head.id.stringify)
+											} else {
+												None
+											}, spaceId, if(folders.length > 0) {
+												Some(folders.head.id.stringify)
+											} else {
+												None
+											})"><i class="glyphicon glyphicon-chevron-left"></i> Prev</a>
+										}
+									}
+									@pager.next match {
+										case None => {
+											<button class="btn btn-sm btn-link disabled" disabled="true" style="cursor:not-allowed;border-radius:15px;border-color:lightgray;">Next <i class="glyphicon glyphicon-chevron-right"></i></button>
+										}
+										case Some(next) => {
+											<a class="btn btn-sm btn-link" style="border-radius:15px;border-color:lightgray;" href="@routes.Files.file(next, if(datasets.length > 0) {
+												Some(datasets.head.id.stringify)
+											} else {
+												None
+											}, spaceId, if(folders.length > 0) {
+												Some(folders.head.id.stringify)
+											} else {
+												None
+											})">Next <i class="glyphicon glyphicon-chevron-right"></i></a>
+										}
+									}
 
-										</div>
-									</div>
-								}
-							}
+								</div>
+							</div>
 						}
 					}
 				</div>