fix(repos): fix repos pagination (close #472)

bleenco · Jan 4, 2021 · 2c0c5f3 · 2c0c5f3
1 parent 392b75c
commit 2c0c5f3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/server/store/repo/repo.go b/server/store/repo/repo.go
@@ -76,11 +76,15 @@ func (s repositoryStore) List(filters core.RepositoryFilter) ([]core.Repository,
 			Or("team_users.user_id = ? AND permissions.read = ? AND repositories.full_name LIKE ?", filters.UserID, true, keyword)
 	}
 
-	if filters.Limit != 0 && filters.Offset != 0 {
-		db = db.Limit(filters.Limit).Offset(filters.Offset)
+	if filters.Limit != 0 {
+		db = db.Limit(filters.Limit)
 	}
 
-	err = db.Order("active desc, name asc").Group("repositories.id").Find(&repos).Count(&count).Error
+	if filters.Offset != 0 {
+		db = db.Offset(filters.Offset)
+	}
+
+	err = db.Order("active desc, name asc").Group("repositories.id").Find(&repos).Limit(-1).Count(&count).Error
 	if err != nil || count == 0 {
 		return repos, count, err
 	}

diff --git a/web/abstruse/src/app/repos/repos/repos.component.html b/web/abstruse/src/app/repos/repos/repos.component.html
@@ -59,8 +59,9 @@ <h2>My Repositories</h2>
           *ngFor="let p of pages"
           (click)="setPage(p)"
           [class.is-active]="page === p"
-          >{{ p }}</span
         >
+          {{ p }}
+        </span>
         <span class="btn" (click)="next()">Next</span>
       </div>
     </div>

diff --git a/web/abstruse/src/styles/pagination.sass b/web/abstruse/src/styles/pagination.sass
@@ -21,6 +21,9 @@
       color: $text-primary
       border: 1px solid $gray
 
+    &.is-hidden
+      display: none
+
   .btn
     padding: 5px 10px
     margin: 0 5px