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

Show only unread when selecting unread

Browse Source 
Before, when there was no unread articles, all articles where displayed. This behaviour was not the one intended.
Now, when there is no unread articles, a message is displayed to alert that there is no article.

See #428

Correction after comment
This commit is contained in:
Alexis Degrugillier
2014-03-01 14:30:55 -05:00
parent 71f7ce1be5
commit 736ee492a0
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);