@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.) hq.recaptime.dev/wiki/Phorge
phorge phabricator
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Add pager to all Audit Views

Summary: Fixes T1153, removes the "active" restriction from pagination

Test Plan: Bring up audit, test pager exists, and doesn't exist when needed

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: aik099, epriestley, Korvin

Maniphest Tasks: T1153

Differential Revision: https://secure.phabricator.com/D8643

+14 -31
+14 -31
src/applications/audit/controller/PhabricatorAuditListController.php
··· 271 271 272 272 $query = new PhabricatorAuditQuery(); 273 273 274 - $use_pager = ($this->filter != 'active'); 275 - 276 - if ($use_pager) { 277 - $pager = new AphrontPagerView(); 278 - $pager->setURI($request->getRequestURI(), 'offset'); 279 - $pager->setOffset($request->getInt('offset')); 274 + $pager = new AphrontPagerView(); 275 + $pager->setURI($request->getRequestURI(), 'offset'); 276 + $pager->setOffset($request->getInt('offset')); 280 277 281 - $query->setOffset($pager->getOffset()); 282 - $query->setLimit($pager->getPageSize() + 1); 283 - } 278 + $query->setOffset($pager->getOffset()); 279 + $query->setLimit($pager->getPageSize() + 1); 284 280 285 281 $awaiting = null; 286 282 ··· 375 371 $query->needCommitData(true); 376 372 377 373 $audits = $query->execute(); 378 - if ($use_pager) { 379 - $audits = $pager->sliceResults($audits); 380 - } 374 + $audits = $pager->sliceResults($audits); 381 375 382 376 $view = new PhabricatorAuditListView(); 383 377 $view->setAudits($audits); ··· 394 388 $panel->appendChild($view); 395 389 $panel->setNoBackground(); 396 390 397 - if ($use_pager) { 398 - $panel->appendChild($pager); 399 - } 391 + $panel->appendChild($pager); 400 392 401 393 return $panel; 402 394 } ··· 408 400 $query->needCommitData(true); 409 401 $query->needAudits(true); 410 402 411 - $use_pager = ($this->filter != 'active'); 403 + $pager = new AphrontPagerView(); 404 + $pager->setURI($request->getRequestURI(), 'offset'); 405 + $pager->setOffset($request->getInt('offset')); 412 406 413 - if ($use_pager) { 414 - $pager = new AphrontPagerView(); 415 - $pager->setURI($request->getRequestURI(), 'offset'); 416 - $pager->setOffset($request->getInt('offset')); 417 - 418 - $query->setOffset($pager->getOffset()); 419 - $query->setLimit($pager->getPageSize() + 1); 420 - } 407 + $query->setOffset($pager->getOffset()); 408 + $query->setLimit($pager->getPageSize() + 1); 421 409 422 410 switch ($this->filter) { 423 411 case 'active': ··· 471 459 } 472 460 473 461 $commits = $query->execute(); 474 - 475 - if ($use_pager) { 476 - $commits = $pager->sliceResults($commits); 477 - } 462 + $commits = $pager->sliceResults($commits); 478 463 479 464 $view = new PhabricatorAuditCommitListView(); 480 465 $view->setUser($request->getUser()); ··· 490 475 $panel->appendChild($view); 491 476 $panel->setNoBackground(); 492 477 493 - if ($use_pager) { 494 - $panel->appendChild($pager); 495 - } 478 + $panel->appendChild($pager); 496 479 497 480 return $panel; 498 481 }