mirror of
https://tt-rss.org/git/tt-rss.git
synced 2024-06-30 12:30:52 +02:00
add toolbar checkbox to include subcategories to viewfeed()
This commit is contained in:
parent
99c9e91a51
commit
09101297ee
|
@ -119,7 +119,7 @@ class Feeds extends Protected_Handler {
|
||||||
|
|
||||||
private function format_headlines_list($feed, $method, $view_mode, $limit, $cat_view,
|
private function format_headlines_list($feed, $method, $view_mode, $limit, $cat_view,
|
||||||
$next_unread_feed, $offset, $vgr_last_feed = false,
|
$next_unread_feed, $offset, $vgr_last_feed = false,
|
||||||
$override_order = false) {
|
$override_order = false, $include_children = false) {
|
||||||
|
|
||||||
$disable_cache = false;
|
$disable_cache = false;
|
||||||
|
|
||||||
|
@ -196,7 +196,8 @@ class Feeds extends Protected_Handler {
|
||||||
}
|
}
|
||||||
// error_log("search_mode: " . $search_mode);
|
// error_log("search_mode: " . $search_mode);
|
||||||
$qfh_ret = queryFeedHeadlines($this->link, $feed, $limit, $view_mode, $cat_view,
|
$qfh_ret = queryFeedHeadlines($this->link, $feed, $limit, $view_mode, $cat_view,
|
||||||
$search, $search_mode, $match_on, $override_order, $offset);
|
$search, $search_mode, $match_on, $override_order, $offset, 0,
|
||||||
|
false, 0, $include_children);
|
||||||
|
|
||||||
if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H1", $timing_info);
|
if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H1", $timing_info);
|
||||||
|
|
||||||
|
@ -758,11 +759,12 @@ class Feeds extends Protected_Handler {
|
||||||
$method = db_escape_string($_REQUEST["m"]);
|
$method = db_escape_string($_REQUEST["m"]);
|
||||||
$view_mode = db_escape_string($_REQUEST["view_mode"]);
|
$view_mode = db_escape_string($_REQUEST["view_mode"]);
|
||||||
$limit = (int) get_pref($this->link, "DEFAULT_ARTICLE_LIMIT");
|
$limit = (int) get_pref($this->link, "DEFAULT_ARTICLE_LIMIT");
|
||||||
@$cat_view = db_escape_string($_REQUEST["cat"]) == "true";
|
@$cat_view = $_REQUEST["cat"] == "true";
|
||||||
@$next_unread_feed = db_escape_string($_REQUEST["nuf"]);
|
@$next_unread_feed = db_escape_string($_REQUEST["nuf"]);
|
||||||
@$offset = db_escape_string($_REQUEST["skip"]);
|
@$offset = db_escape_string($_REQUEST["skip"]);
|
||||||
@$vgroup_last_feed = db_escape_string($_REQUEST["vgrlf"]);
|
@$vgroup_last_feed = db_escape_string($_REQUEST["vgrlf"]);
|
||||||
$order_by = db_escape_string($_REQUEST["order_by"]);
|
$order_by = db_escape_string($_REQUEST["order_by"]);
|
||||||
|
$include_children = $_REQUEST["include_children"] == "on";
|
||||||
|
|
||||||
if (is_numeric($feed)) $feed = (int) $feed;
|
if (is_numeric($feed)) $feed = (int) $feed;
|
||||||
|
|
||||||
|
@ -856,7 +858,7 @@ class Feeds extends Protected_Handler {
|
||||||
|
|
||||||
$ret = $this->format_headlines_list($feed, $method,
|
$ret = $this->format_headlines_list($feed, $method,
|
||||||
$view_mode, $limit, $cat_view, $next_unread_feed, $offset,
|
$view_mode, $limit, $cat_view, $next_unread_feed, $offset,
|
||||||
$vgroup_last_feed, $override_order);
|
$vgroup_last_feed, $override_order, $include_children);
|
||||||
|
|
||||||
$topmost_article_ids = $ret[0];
|
$topmost_article_ids = $ret[0];
|
||||||
$headlines_count = $ret[1];
|
$headlines_count = $ret[1];
|
||||||
|
|
|
@ -2287,7 +2287,7 @@
|
||||||
return $rv;
|
return $rv;
|
||||||
}
|
}
|
||||||
|
|
||||||
function queryFeedHeadlines($link, $feed, $limit, $view_mode, $cat_view, $search, $search_mode, $match_on, $override_order = false, $offset = 0, $owner_uid = 0, $filter = false, $since_id = 0) {
|
function queryFeedHeadlines($link, $feed, $limit, $view_mode, $cat_view, $search, $search_mode, $match_on, $override_order = false, $offset = 0, $owner_uid = 0, $filter = false, $since_id = 0, $include_children = false) {
|
||||||
|
|
||||||
if (!$owner_uid) $owner_uid = $_SESSION["uid"];
|
if (!$owner_uid) $owner_uid = $_SESSION["uid"];
|
||||||
|
|
||||||
|
@ -2332,7 +2332,7 @@
|
||||||
} else if ($feed != -1) {
|
} else if ($feed != -1) {
|
||||||
$unread = getFeedUnread($link, $feed, $cat_view);
|
$unread = getFeedUnread($link, $feed, $cat_view);
|
||||||
|
|
||||||
if ($cat_view && $feed > 0)
|
if ($cat_view && $feed > 0 && $include_children)
|
||||||
$unread += getCategoryChildrenUnread($link, $feed);
|
$unread += getCategoryChildrenUnread($link, $feed);
|
||||||
|
|
||||||
if ($unread > 0) {
|
if ($unread > 0) {
|
||||||
|
@ -2406,6 +2406,7 @@
|
||||||
if ($cat_view) {
|
if ($cat_view) {
|
||||||
|
|
||||||
if ($feed > 0) {
|
if ($feed > 0) {
|
||||||
|
if ($include_children) {
|
||||||
# sub-cats
|
# sub-cats
|
||||||
$subcats = getChildCategories($link, $feed, $owner_uid);
|
$subcats = getChildCategories($link, $feed, $owner_uid);
|
||||||
|
|
||||||
|
@ -2416,6 +2417,9 @@
|
||||||
$query_strategy_part = "cat_id IN (".
|
$query_strategy_part = "cat_id IN (".
|
||||||
implode(",", $subcats).")";
|
implode(",", $subcats).")";
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
$query_strategy_part = "cat_id = '$feed'";
|
||||||
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
$query_strategy_part = "cat_id IS NULL";
|
$query_strategy_part = "cat_id IS NULL";
|
||||||
|
|
|
@ -183,6 +183,14 @@
|
||||||
<option value="score"><?php echo __('Score') ?></option>
|
<option value="score"><?php echo __('Score') ?></option>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<input dojoType="dijit.form.CheckBox" type="checkbox"
|
||||||
|
onchange="viewCurrentFeed()"
|
||||||
|
name="include_children" id="include_children">
|
||||||
|
<label id="include_children_label" for="include_children">
|
||||||
|
<?php echo __('With subcategories') ?></label>
|
||||||
|
|
||||||
<button dojoType="dijit.form.Button" name="update"
|
<button dojoType="dijit.form.Button" name="update"
|
||||||
onclick="scheduleFeedUpdate()">
|
onclick="scheduleFeedUpdate()">
|
||||||
<?php echo __('Update') ?></button>
|
<?php echo __('Update') ?></button>
|
||||||
|
|
|
@ -42,6 +42,14 @@ function setActiveFeedId(id, is_cat) {
|
||||||
|
|
||||||
selectFeed(id, is_cat);
|
selectFeed(id, is_cat);
|
||||||
|
|
||||||
|
if (is_cat && id > 0) {
|
||||||
|
document.forms["main_toolbar_form"].include_children.disabled = false;
|
||||||
|
$("include_children_label").removeClassName("insensitive");
|
||||||
|
} else {
|
||||||
|
document.forms["main_toolbar_form"].include_children.disabled = true;
|
||||||
|
$("include_children_label").addClassName("insensitive");
|
||||||
|
}
|
||||||
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
exception_error("setActiveFeedId", e);
|
exception_error("setActiveFeedId", e);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user