Add an error message when a query is deprecated.

See https://github.com/marienfressinaud/FreshRSS/issues/625
This commit is contained in:
Marien Fressinaud
2014-09-19 14:35:02 +02:00
parent ba378791c2
commit 08cc7c4cd4
3 changed files with 13 additions and 4 deletions

View File

@@ -46,6 +46,7 @@ return array (
'no_query' => 'You havent created any user query yet.',
'query_filter' => 'Filter applied:',
'no_query_filter' => 'No filter',
'query_deprecated' => 'This query is no longer valid. The concerned category or feed has been deleted.',
'about' => 'About',
'stats' => 'Statistics',
'stats_idle' => 'Idle feeds',

View File

@@ -46,6 +46,7 @@ return array (
'no_query' => 'Vous navez pas encore créé de filtre.',
'query_filter' => 'Filtres appliqués :',
'no_query_filter' => 'Aucun filtre appliqué',
'query_deprecated' => 'Ce filtre nest plus valide. La catégorie ou le flux concerné a été supprimé.',
'about' => 'À propos',
'stats' => 'Statistiques',
'stats_idle' => 'Flux inactifs',

View File

@@ -42,30 +42,37 @@
+ (isset($query['get']) ? 1 : 0);
// If the only filter is "all" articles, we consider there is no filter
$exist = ($exist === 1 && isset($query['get']) && $query['get'] === 'a') ? 0 : $exist;
$deprecated = (isset($this->query_get[$key]) &&
$this->query_get[$key]['deprecated']);
?>
<?php if ($exist === 0) { ?>
<div class="alert alert-warn">
<div class="alert-head"><?php echo _t('no_query_filter'); ?></div>
</div>
<?php } elseif ($deprecated) { ?>
<div class="alert alert-error">
<div class="alert-head"><?php echo _t('query_deprecated'); ?></div>
</div>
<?php } else { ?>
<div class="alert alert-success">
<div class="alert-head"><?php echo _t('query_filter'); ?></div>
<ul>
<?php if (isset($query['search'])) { $exist = true; ?>
<?php if (isset($query['search'])) { ?>
<li class="item"><?php echo _t('query_search', $query['search']); ?></li>
<?php } ?>
<?php if (isset($query['state'])) { $exist = true; ?>
<?php if (isset($query['state'])) { ?>
<li class="item"><?php echo _t('query_state_' . $query['state']); ?></li>
<?php } ?>
<?php if (isset($query['order'])) { $exist = true; ?>
<?php if (isset($query['order'])) { ?>
<li class="item"><?php echo _t('query_order_' . strtolower($query['order'])); ?></li>
<?php } ?>
<?php if (isset($query['get'])) { $exist = true; ?>
<?php if (isset($query['get'])) { ?>
<li class="item"><?php echo _t('query_get_' . $this->query_get[$key]['type'], $this->query_get[$key]['name']); ?></li>
<?php } ?>
</ul>