From 8b74b8ca3480440b3451f6569b0f6bc52e059550 Mon Sep 17 00:00:00 2001 From: Christopher Moore Date: Fri, 1 Jul 2016 06:08:44 -0700 Subject: [PATCH] allow using "page" for connection pagination --- src/Support/Definition/RelayConnectionType.php | 3 +++ src/Support/Traits/RelayConnection.php | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Support/Definition/RelayConnectionType.php b/src/Support/Definition/RelayConnectionType.php index 605eaae502..82a4a7dcbd 100644 --- a/src/Support/Definition/RelayConnectionType.php +++ b/src/Support/Definition/RelayConnectionType.php @@ -100,6 +100,9 @@ public static function connectionArgs() ], 'last' => [ 'type' => Type::int() + ], + 'page' => [ + 'type' => Type::int(), ] ]; } diff --git a/src/Support/Traits/RelayConnection.php b/src/Support/Traits/RelayConnection.php index c54ef55b80..61a3d1bd00 100644 --- a/src/Support/Traits/RelayConnection.php +++ b/src/Support/Traits/RelayConnection.php @@ -19,7 +19,8 @@ public function scopeGetConnection($query, array $args) { $first = isset($args['first']) ? $args['first'] : 15; $after = $this->decodeCursor($args); - $currentPage = $first && $after ? floor(($first + $after) / $first) : 1; + $page = isset($args['page']) ? $args['page'] : 1; + $currentPage = $first && $after ? floor(($first + $after) / $first) : $page; return $query->paginate($first, ['*'], 'page', $currentPage); }