mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-04-26 01:07:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug #25 mais le code ne me convient pas. Le bug #28 devra corriger ce soucis

Browse Source
This commit is contained in:
Marien Fressinaud
2013-03-14 20:10:15 +01:00
parent d2c20395c0
commit 47196182e5
3 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/indexController.php
View File

@@ -74,9 +74,7 @@ class indexController extends ActionController {
try {
$this->view->entryPaginator = $entryDAO->getPaginator ($entries);
} catch (CurrentPagePaginationException $e) {
$error = true;
}
} catch (CurrentPagePaginationException $e) { }
$this->view->cat_aside = $catDAO->listCategories ();
$this->view->nb_favorites = $entryDAO->countFavorites ();

23
app/models/Entry.php
View File

@@ -247,7 +247,7 @@ class EntryDAO extends Model_pdo {
$res = $stm->fetchAll (PDO::FETCH_ASSOC);
$this->nbItems = $res[0]['count'];
$deb = ($this->currentPage - 1) * $this->nbItemsPerPage;
$deb = ($this->currentPage () - 1) * $this->nbItemsPerPage;
$fin = $this->nbItemsPerPage;
$sql = 'SELECT * FROM entry' . $where
@@ -281,7 +281,7 @@ class EntryDAO extends Model_pdo {
$sql = 'SELECT * FROM entry' . $where
. ' ORDER BY date' . $order;
} else {
$deb = ($this->currentPage - 1) * $this->nbItemsPerPage;
$deb = ($this->currentPage () - 1) * $this->nbItemsPerPage;
$fin = $this->nbItemsPerPage;
$sql = 'SELECT * FROM entry' . $where
@@ -314,7 +314,7 @@ class EntryDAO extends Model_pdo {
$res = $stm->fetchAll (PDO::FETCH_ASSOC);
$this->nbItems = $res[0]['count'];
$deb = ($this->currentPage - 1) * $this->nbItemsPerPage;
$deb = ($this->currentPage () - 1) * $this->nbItemsPerPage;
$fin = $this->nbItemsPerPage;
$sql = 'SELECT e.* FROM entry e INNER JOIN feed f ON e.id_feed = f.id' . $where
. ' ORDER BY date' . $order
@@ -348,7 +348,7 @@ class EntryDAO extends Model_pdo {
$res = $stm->fetchAll (PDO::FETCH_ASSOC);
$this->nbItems = $res[0]['count'];
$deb = ($this->currentPage - 1) * $this->nbItemsPerPage;
$deb = ($this->currentPage () - 1) * $this->nbItemsPerPage;
$fin = $this->nbItemsPerPage;
$sql = 'SELECT * FROM entry e' . $where
. ' ORDER BY date' . $order
@@ -400,12 +400,25 @@ class EntryDAO extends Model_pdo {
public function _currentPage ($value) {
$this->currentPage = $value;
}
public function currentPage () {
if ($this->currentPage < 1) {
return 1;
}
$maxPage = ceil ($this->nbItems / $this->nbItemsPerPage);
if ($this->currentPage > $maxPage) {
return $maxPage;
}
return $this->currentPage;
}
public function getPaginator ($entries) {
$paginator = new Paginator ($entries);
$paginator->_nbItems ($this->nbItems);
$paginator->_nbItemsPerPage ($this->nbItemsPerPage);
$paginator->_currentPage ($this->currentPage);
$paginator->_currentPage ($this->currentPage ());
return $paginator;
}

7
app/views/index/index.phtml
View File

@@ -1,6 +1,5 @@
<?php $this->partial ('aside_flux'); ?>
<?php $items = $this->entryPaginator->items (true); ?>
<div class="nav_menu">
<a class="btn" href="<?php echo Url::display (array ('c' => 'feed', 'a' => 'actualize')); ?>"><i class="icon refresh"></i></a>
@@ -13,8 +12,10 @@
<?php } ?>
</div>
<?php if (!empty ($items)) { ?>
<?php
if (isset ($this->entryPaginator)) {
$items = $this->entryPaginator->items (true);
?>
<div id="stream">
<?php
$display_today = true;