Merge branch 'develop' into bin2107

src/main/webapp/ux/plugins/gaga/gaga.paging.js

@@ -165,13 +165,12 @@ var gagaPaging = {
 		let pageSize = pageable.pageSize;
 		let pageUnit = pageable.pageUnit;
 		let totalCount = pageable.totalCount;
-
 		let firstCount = (getPageGroup() - 1) * pageable.pageUnit + 1;
 		let loopCount = firstCount + pageUnit;
 		if (loopCount > getTotalPage()) {
-			loopCount = getTotalPage() + 1;
+			loopCount = Number(getTotalPage() + 1);
 		}
-
+		
 		var pageTag = '';
 		if (!(firstCount == 1 && loopCount == 1)) {
 			if (pageNo == 1) {
@@ -193,20 +192,24 @@ var gagaPaging = {
 					pageTag += "<a class=\"num\" href=\"#pageNo=" + i + "\">" + i +"</a>\n"
 				}
 			}
-
-			if (loopCount <= (getTotalPage() + 1)) {
-				if (pageNo == getTotalPage()) {
-					pageTag += "<a class=\"arrow\" href=\"#\"><i class=\"fa fa-angle-right\" alt=\"다음페이지\"></i></a>\n";
-					pageTag += "<a class=\"arrow\" href=\"#\"><i class=\"fa fa-angle-double-right\" alt=\"맨마지막\"></i></a>\n";
-				} else {
-					pageTag += "<a class=\"arrow\" href=\"#pageNo=" + (getPageGroup() * pageUnit + 1) + "\"><i class=\"fa fa-angle-right\" alt=\"다음페이지\"></i></a>\n";
+			
+			if (loopCount <= (Number(getTotalPage() + 1))) {
+				//if (getTotalPage() <= pageUnit) {
+				//	pageTag += "<a class=\"arrow\" href=\"#\"><i class=\"fa fa-angle-right\" alt=\"다음페이지\"></i></a>\n";
+				//	pageTag += "<a class=\"arrow\" href=\"#\"><i class=\"fa fa-angle-double-right\" alt=\"맨마지막\"></i></a>\n";
+				//} else {
+					if (getTotalPage() > loopCount){
+						pageTag += "<a class=\"arrow\" href=\"#pageNo=" + (getPageGroup() * pageUnit + 1) + "\"><i class=\"fa fa-angle-right\" alt=\"다음페이지\"></i></a>\n";	
+					}else{
+						pageTag += "<a class=\"arrow\" href=\"#pageNo=" + getTotalPage() + "\"><i class=\"fa fa-angle-right\" alt=\"다음페이지\"></i></a>\n";
+					}
 					pageTag += "<a class=\"arrow\" href=\"#pageNo=" + getTotalPage() + "\"><i class=\"fa fa-angle-double-right\" alt=\"맨마지막\"></i></a>\n";
-				}
+				//}
 			}
 		}
 
 		function getPageGroup() {
-			return parseInt(pageNo / pageUnit + 1 );
+			return parseInt((pageNo-1) / pageUnit + 1 );
 		}
 
 		function getTotalPage() {