Skip to content

Commit

Permalink
Adding ordering options to feed
Browse files Browse the repository at this point in the history
Adding ability to show all sermons in the feed
  • Loading branch information
Bakual committed Jun 17, 2024
1 parent 0d582c6 commit 8a3f30d
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 13 deletions.
36 changes: 26 additions & 10 deletions com_sermonspeaker/admin/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@
label="COM_SERMONSPEAKER_FIELD_DEFAULT_PAGINATION_LIMIT_LABEL"
description="COM_SERMONSPEAKER_FIELD_DEFAULT_PAGINATION_LIMIT_DESC"
useglobal="true"
showall="true"
/>

<field
Expand Down Expand Up @@ -1174,19 +1175,34 @@

<field
name="feed_limit"
type="list"
type="limitbox"
label="COM_SERMONSPEAKER_PARAM_FEED_LIMIT_LABEL"
filter="integer"
useglobal="true"
showall="true"
/>

<field
name="feed_order"
type="list"
label="COM_SERMONSPEAKER_PARAM_DEFAULT_ORDER_LABEL"
default="date"
>
<option value="5">J5</option>
<option value="10">J10</option>
<option value="15">J15</option>
<option value="20">J20</option>
<option value="25">J25</option>
<option value="30">J30</option>
<option value="50">J50</option>
<option value="100">J100</option>
<option value="sermon_date">COM_SERMONSPEAKER_PARAM_DEFAULT_ORDER_OPTION_DATE</option>
<option value="publish_up">COM_SERMONSPEAKER_PARAM_DEFAULT_ORDER_OPTION_PUBLISHING_DATE</option>
<option value="created">JGLOBAL_FIELD_CREATED_LABEL</option>
<option value="modified">JGLOBAL_FIELD_MODIFIED_LABEL</option>
<option value="ordering">COM_SERMONSPEAKER_PARAM_DEFAULT_ORDER_OPTION_ORDERING</option>
<option value="title">COM_SERMONSPEAKER_PARAM_DEFAULT_ORDER_OPTION_TITLE</option>
</field>

<field
name="feed_order_dir"
type="list"
label="COM_SERMONSPEAKER_PARAM_DEFAULT_ORDER_DIR_LABEL"
default="DESC"
>
<option value="ASC">COM_SERMONSPEAKER_PARAM_DEFAULT_ORDER_DIR_OPTION_ASC</option>
<option value="DESC">COM_SERMONSPEAKER_PARAM_DEFAULT_ORDER_DIR_OPTION_DESC</option>
</field>

<field
Expand Down
9 changes: 6 additions & 3 deletions com_sermonspeaker/site/models/feed.php
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,13 @@ function getData()
$query->where('sermons.podcast = 1');
$query->where('sermons.state = 1');

// Grouping
$query->order('sermons.sermon_date DESC');
// Ordering
$orderCol = $params->get('feed_order', 'sermon_date');
$orderDir = $params->get('feed_order_dir', 'DESC');
$query->order('sermons.' . $orderCol . ' ' . $orderDir);

$db->setQuery($query, '0', $app->get('feed_limit'));
$feed_limit = $params->get('feed_limit', $app->get('feed_limit'));
$db->setQuery($query, '0', $feed_limit);

return $db->loadObjectList();
}
Expand Down

0 comments on commit 8a3f30d

Please sign in to comment.