mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-04-16 12:27:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #434 from aledeg/issue428

Browse Source 
Show only unread when selecting unread
This commit is contained in:
Alexandre Alapetite
2014-03-01 20:42:18 +01:00
parent 71f7ce1be5 c56cd80917
commit 6939b7989b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Controllers/indexController.php
View File

@@ -84,6 +84,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
// On récupère les différents éléments de filtrage
$this->view->state = $state = Minz_Request::param ('state', $this->view->conf->default_view);
$state_param = Minz_Request::param ('state', null);
$filter = Minz_Request::param ('search', '');
if (!empty($filter)) {
$state = 'all'; //Search always in read and unread articles
@@ -111,7 +112,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
$hasUnread = true;
break;
}
if (!$hasUnread) {
if (!$hasUnread && is_null($state_param)) {
$this->view->state = $state = 'all';
}
}
@@ -129,7 +130,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
// Si on a récupéré aucun article "non lus"
// on essaye de récupérer tous les articles
if ($state === 'not_read' && empty($entries)) {
if ($state === 'not_read' && empty($entries) && is_null($state_param)) {
Minz_Log::record ('Conflicting information about nbNotRead!', Minz_Log::DEBUG);
$this->view->state = 'all';
$entries = $entryDAO->listWhere($getType, $getId, 'all', $order, $nb, $first, $filter, $date_min, $keepHistoryDefault);