Add group filter to the history section

This commit is contained in:
denfil 2016-02-28 16:58:07 +03:00
parent bd0e6af722
commit 55db6f13dd
4 changed files with 46 additions and 9 deletions

View File

@ -4,15 +4,20 @@
Router\get_action('history', function() { Router\get_action('history', function() {
$offset = Request\int_param('offset', 0); $offset = Request\int_param('offset', 0);
$nb_items = Model\Item\count_by_status('read'); $group_id = Request\int_param('group_id', null);
$feed_ids = array();
if (! is_null($group_id)) {
$feed_ids = Model\Group\get_feeds_by_group($group_id);
}
$items = Model\Item\get_all_by_status( $items = Model\Item\get_all_by_status(
'read', 'read',
array(), $feed_ids,
$offset, $offset,
Model\Config\get('items_per_page'), Model\Config\get('items_per_page'),
'updated', 'updated',
Model\Config\get('items_sorting_direction') Model\Config\get('items_sorting_direction')
); );
$nb_items = Model\Item\count_by_status('read', $feed_ids);
Response\html(Template\layout('history', array( Response\html(Template\layout('history', array(
'favicons' => Model\Favicon\get_item_favicons($items), 'favicons' => Model\Favicon\get_item_favicons($items),
@ -21,20 +26,23 @@ Router\get_action('history', function() {
'order' => '', 'order' => '',
'direction' => '', 'direction' => '',
'display_mode' => Model\Config\get('items_display_mode'), 'display_mode' => Model\Config\get('items_display_mode'),
'group_id' => $group_id,
'nb_items' => $nb_items, 'nb_items' => $nb_items,
'nb_unread_items' => Model\Item\count_by_status('unread'), 'nb_unread_items' => Model\Item\count_by_status('unread'),
'offset' => $offset, 'offset' => $offset,
'items_per_page' => Model\Config\get('items_per_page'), 'items_per_page' => Model\Config\get('items_per_page'),
'nothing_to_read' => Request\int_param('nothing_to_read'), 'nothing_to_read' => Request\int_param('nothing_to_read'),
'menu' => 'history', 'menu' => 'history',
'groups' => Model\Group\get_all(),
'title' => t('History').' ('.$nb_items.')' 'title' => t('History').' ('.$nb_items.')'
))); )));
}); });
// Confirmation box to flush history // Confirmation box to flush history
Router\get_action('confirm-flush-history', function() { Router\get_action('confirm-flush-history', function() {
$group_id = Request\int_param('group_id', null);
Response\html(Template\layout('confirm_flush_items', array( Response\html(Template\layout('confirm_flush_items', array(
'group_id' => $group_id,
'nb_unread_items' => Model\Item\count_by_status('unread'), 'nb_unread_items' => Model\Item\count_by_status('unread'),
'menu' => 'history', 'menu' => 'history',
'title' => t('Confirmation') 'title' => t('Confirmation')
@ -43,7 +51,11 @@ Router\get_action('confirm-flush-history', function() {
// Flush history // Flush history
Router\get_action('flush-history', function() { Router\get_action('flush-history', function() {
$group_id = Request\int_param('group_id', null);
Model\Item\mark_all_as_removed(); if (!is_null($group_id)) {
Model\Item\mark_group_as_removed($group_id);
} else {
Model\Item\mark_all_as_removed();
}
Response\redirect('?action=history'); Response\redirect('?action=history');
}); });

View File

@ -376,6 +376,19 @@ function mark_group_as_read($group_id)
->update(array('status' => 'read')); ->update(array('status' => 'read'));
} }
// Mark all items of a group as removed
function mark_group_as_removed($group_id)
{
$feed_ids = Group\get_feeds_by_group($group_id);
return Database::getInstance('db')
->table('items')
->eq('status', 'read')
->eq('bookmark', 0)
->in('feed_id', $feed_ids)
->save(array('status' => 'removed', 'content' => ''));
}
// Mark all read items to removed after X days // Mark all read items to removed after X days
function autoflush_read() function autoflush_read()
{ {

View File

@ -5,6 +5,6 @@
<p class="alert alert-info"><?= t('Do you really want to remove these items from your history?') ?></p> <p class="alert alert-info"><?= t('Do you really want to remove these items from your history?') ?></p>
<div class="form-actions"> <div class="form-actions">
<a href="?action=flush-history" class="btn btn-red"><?= t('Remove') ?></a> <a href="?action=flush-history<?= is_null($group_id) ? '' : '&amp;group_id='.$group_id ?>" class="btn btn-red"><?= t('Remove') ?></a>
<?= t('or') ?> <a href="?action=history"><?= t('cancel') ?></a> <?= t('or') ?> <a href="?action=history<?= is_null($group_id) ? '' : '&amp;group_id='.$group_id ?>"><?= t('cancel') ?></a>
</div> </div>

View File

@ -4,8 +4,20 @@
<div class="page-header"> <div class="page-header">
<h2><?= t('History') ?><span id="page-counter"><?= isset($nb_items) ? $nb_items : '' ?></span></h2> <h2><?= t('History') ?><span id="page-counter"><?= isset($nb_items) ? $nb_items : '' ?></span></h2>
<?php if (!empty($groups)): ?>
<nav>
<ul id="grouplist">
<?php foreach ($groups as $group): ?>
<li <?= $group['id'] == $group_id ? 'class="active"' : '' ?>>
<a href="?action=history&group_id=<?=$group['id']?>"><?=$group['title']?></a>
</li>
<?php endforeach ?>
</ul>
</nav>
<?php endif ?>
<ul> <ul>
<li><a href="?action=confirm-flush-history"><?= t('flush all items') ?></a></li> <li><a href="?action=confirm-flush-history<?= is_null($group_id) ? '' : '&amp;group_id='.$group_id ?>"><?= t('flush all items') ?></a></li>
</ul> </ul>
</div> </div>
@ -26,7 +38,7 @@
)) ?> )) ?>
<?php endforeach ?> <?php endforeach ?>
<?= \Template\load('paging', array('menu' => $menu, 'nb_items' => $nb_items, 'items_per_page' => $items_per_page, 'offset' => $offset, 'order' => $order, 'direction' => $direction)) ?> <?= \Template\load('paging', array('menu' => $menu, 'nb_items' => $nb_items, 'items_per_page' => $items_per_page, 'offset' => $offset, 'order' => $order, 'direction' => $direction, 'group_id' => $group_id)) ?>
</section> </section>
<?php endif ?> <?php endif ?>