Add perPage

Author: MGatner

src/Controllers/Files.php

@@ -616,11 +616,11 @@ protected function setDefaults(): self
 			'userId'   => null,
 			'username' => '',
 			'ajax'     => $this->request->isAJAX(),
+			'search'   => $this->request->getVar('search'),
 			'sort'     => $this->getSort(),
 			'order'    => $this->getOrder(),
 			'format'   => $this->getFormat(),
-			'search'   => $this->request->getVar('search'),
-			'perPage'  => service('settings')->perPage,
+			'perPage'  => $this->getPerPage(),
 			'page'     => $this->request->getVar('page'),
 			'pager'    => null,
 			'access'   => $this->model->mayAdmin() ? 'manage' : 'display',
@@ -685,6 +685,33 @@ protected function getOrder(): string
 		return 'asc';
 	}
 
+	/**
+	 * Determines items per page.
+	 *
+	 * @return int
+	 */
+	protected function getPerPage(): int
+	{
+		// Check for a request, then load from Settings
+		$nums = [
+			$this->request->getVar('perPage'),
+			service('settings')->perPage,
+		];
+
+		foreach ($nums as $num)
+		{
+			// Validate
+			if (is_numeric($num) && (int) $num > 0)
+			{
+				// Update user setting with the new preference
+				service('settings')->perPage = $num;
+				return $num;
+			}
+		}
+
+		return 10;
+	}
+
 	/**
 	 * Determines the display format.
 	 *

src/Models/FileModel.php

@@ -41,6 +41,7 @@ class FileModel extends Model
 
 	// Permits
 	protected $mode       = 04660;
+	protected $userKey    = 'user_id';
 	protected $pivotKey   = 'file_id';
 	protected $usersPivot = 'files_users';
 

src/Views/Formats/cards.php

@@ -1,4 +1,3 @@
-	<?= $pager ? $pager->only(['search'])->links('default', 'files_bootstrap') : '' ?>
 
 	<?php if (empty($files)): ?>
 	<p>No files to display.</p>

src/Views/Formats/list.php

@@ -1,4 +1,3 @@
-	<?= $pager ? $pager->only(['search'])->links('default', 'files_bootstrap') : '' ?>
 
 	<?php if (empty($files)): ?>
 	<p>No files to display.</p>

src/Views/index.php

@@ -36,6 +36,9 @@
 				</p>
 
 				<?php else: ?>
+
+				<?= $pager ? view('Tatter\Files\Views\pages') : '' ?>
+
 				<form name="files-form" method="post" action="<?= site_url('files/bulk') ?>">
 					<?= $format === 'select' ? view('Tatter\Files\Views\Menus\bulk', ['access' => $access, 'bulks' => $bulks]) : '' ?>
 					<?= view('Tatter\Files\Views\Formats\\' . $format, ['files' => $files, 'access' => $access, 'exports' => $exports]); ?>

src/Views/pages.php

@@ -0,0 +1,17 @@
+
+	<div class="row">
+		<div class="col-sm-6">
+			<?= $pager->only(['search'])->links('default', 'files_bootstrap') ?>
+		</div>
+		<div class="col-sm-4"></div>
+		<div class="col-2 float-right">
+			<form name="files-pages" method="get" action="<?= current_url() ?>">
+				<label class="sr-only" for="perPage">Per page</label>
+				<select class="form-control" name="perPage" id="perPage" onchange="this.form.submit();">
+					<?php foreach ([5, 10, 25, 50, 100, 200] as $num): ?>
+					<option value="<?= $num ?>" <?= $num === $perPage ? 'selected' : '' ?>><?= $num ?></option>
+					<?php endforeach; ?>
+				</select>
+			</form>
+		</div>
+	</div>