diff options
| author | 2014-03-01 14:30:55 -0500 | |
|---|---|---|
| committer | 2014-03-01 14:30:55 -0500 | |
| commit | 736ee492a0fe723b0d6ce9ea59fb3f3eef7ecf23 (patch) | |
| tree | 992ac33776e21e8a991bb3018681cfc2a0f381d0 /app/Controllers | |
| parent | 71f7ce1be5833b54b0f4e1f37e6557425c364725 (diff) | |
Show only unread when selecting unread
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
Diffstat (limited to 'app/Controllers')
| -rwxr-xr-x | app/Controllers/indexController.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php index 38f4c0e7c..c760e0f01 100755 --- a/app/Controllers/indexController.php +++ b/app/Controllers/indexController.php @@ -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); |
