allow skipping count() for big tables - this can be super slow, if no…

… count is done, return 10k rows as guess to ensure pagination works
jippi · May 31, 2014 · 4af6683 · 4af6683
1 parent db92e2f
commit 4af6683
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/Controller/AuditsController.php b/Controller/AuditsController.php
@@ -37,6 +37,7 @@ public function admin_index() {
 				$Instance = ClassRegistry::init($model);
 
 				$displayField = $Instance->displayField;
+				$this->Paginator->settings['do_count'] = empty($Instance->noAuditCount);
 				$this->Paginator->settings['fields'][] = $model . '.' . $displayField;
 				$this->Paginator->settings['joins'][] = [
 					'alias' => $model,

diff --git a/Model/Audit.php b/Model/Audit.php
@@ -36,6 +36,10 @@ public function setupSearchPlugin() {
  * @return integer
  */
 	public function paginateCount($conditions, $recursive, $extra) {
+		if (empty($extra['do_count'])) {
+			return 10000;
+		}
+
 		return $this->find('count', compact('conditions'));
 	}