diff mbox series

[v4,2/2] Allow paginating package comments

Message ID 20180806000258.9780-2-johannes@kyriasis.com
State Accepted, archived
Headers show
Series [v4,1/2] Allow listing all comments from a user | expand

Commit Message

Johannes Löthberg Aug. 6, 2018, 12:02 a.m. UTC 
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
---
Since v3:
  - Switched to list() syntax instead of newer [].

 web/lib/pkgbasefuncs.inc.php | 5 +++--
 web/lib/pkgfuncs.inc.php     | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php
index 953a581..b39bca5 100644
--- a/web/lib/pkgbasefuncs.inc.php
+++ b/web/lib/pkgbasefuncs.inc.php
@@ -291,9 +291,10 @@  function pkgbase_display_details($base_id, $row, $SID="") {
 		unset($pinned);
 
 
-		$limit = isset($_GET['comments']) ? 0 : 10;
-		$comments = pkgbase_comments($base_id, $limit, $include_deleted);
+		$total_comment_count = pkgbase_comments_count($base_id, $include_deleted);
+		list($pagination_templs, $per_page, $offset) = calculate_pagination($total_comment_count);
 
+		$comments = pkgbase_comments($base_id, $per_page, $include_deleted, false, $offset);
 		if (!empty($comments)) {
 			$comment_section = "package";
 			include('pkg_comments.php');
diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php
index 140b8fc..ced1f8e 100644
--- a/web/lib/pkgfuncs.inc.php
+++ b/web/lib/pkgfuncs.inc.php
@@ -630,9 +630,10 @@  function pkg_display_details($id=0, $row, $SID="") {
 		unset($pinned);
 
 
-		$limit = isset($_GET['comments']) ? 0 : 10;
-		$comments = pkgbase_comments($base_id, $limit, $include_deleted);
+		$total_comment_count = pkgbase_comments_count($base_id, $include_deleted);
+		list($pagination_templs, $per_page, $offset) = calculate_pagination($total_comment_count);
 
+		$comments = pkgbase_comments($base_id, $per_page, $include_deleted, false, $offset);
 		if (!empty($comments)) {
 			$comment_section = "package";
 			include('pkg_comments.php');