From 2ecd2df560b60868f10830ce623f32257c2ddfbf Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 13 Aug 2012 18:56:55 +0400 Subject: sorta-kinda fix the feedlist --- js/tt-rss.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'js/tt-rss.js') diff --git a/js/tt-rss.js b/js/tt-rss.js index ef5d72e5b..a4c67bfcc 100644 --- a/js/tt-rss.js +++ b/js/tt-rss.js @@ -61,12 +61,12 @@ function updateFeedList() { } var store = new dojo.data.ItemFileWriteStore({ - url: "backend.php?op=feeds"}); + url: "backend.php?op=pref_feeds&method=getfeedtree&mode=2"}); var treeModel = new fox.FeedStoreModel({ store: store, query: { - "type": "feed" + "type": init_params['enable_feed_cats'] == 1 ? "category" : "feed" }, rootId: "root", rootLabel: "Feeds", @@ -105,6 +105,8 @@ function updateFeedList() { id: "feedTree", }, "feedTree"); + _force_scheduled_update = true; + /* var menu = new dijit.Menu({id: 'feedMenu'}); menu.addChild(new dijit.MenuItem({ -- cgit v1.2.3-54-g00ecf From 09101297ee0596a6c66d9c7388795e8602c24113 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 13 Aug 2012 21:25:46 +0400 Subject: add toolbar checkbox to include subcategories to viewfeed() --- classes/feeds.php | 10 ++++++---- include/functions.php | 24 ++++++++++++++---------- index.php | 8 ++++++++ js/tt-rss.js | 8 ++++++++ 4 files changed, 36 insertions(+), 14 deletions(-) (limited to 'js/tt-rss.js') diff --git a/classes/feeds.php b/classes/feeds.php index 4f0ac4f3f..502efd401 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -119,7 +119,7 @@ class Feeds extends Protected_Handler { private function format_headlines_list($feed, $method, $view_mode, $limit, $cat_view, $next_unread_feed, $offset, $vgr_last_feed = false, - $override_order = false) { + $override_order = false, $include_children = false) { $disable_cache = false; @@ -196,7 +196,8 @@ class Feeds extends Protected_Handler { } // error_log("search_mode: " . $search_mode); $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); @@ -758,11 +759,12 @@ class Feeds extends Protected_Handler { $method = db_escape_string($_REQUEST["m"]); $view_mode = db_escape_string($_REQUEST["view_mode"]); $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"]); @$offset = db_escape_string($_REQUEST["skip"]); @$vgroup_last_feed = db_escape_string($_REQUEST["vgrlf"]); $order_by = db_escape_string($_REQUEST["order_by"]); + $include_children = $_REQUEST["include_children"] == "on"; if (is_numeric($feed)) $feed = (int) $feed; @@ -856,7 +858,7 @@ class Feeds extends Protected_Handler { $ret = $this->format_headlines_list($feed, $method, $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]; $headlines_count = $ret[1]; diff --git a/include/functions.php b/include/functions.php index 1116e422c..3cb503fd8 100644 --- a/include/functions.php +++ b/include/functions.php @@ -2287,7 +2287,7 @@ 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"]; @@ -2332,7 +2332,7 @@ } else if ($feed != -1) { $unread = getFeedUnread($link, $feed, $cat_view); - if ($cat_view && $feed > 0) + if ($cat_view && $feed > 0 && $include_children) $unread += getCategoryChildrenUnread($link, $feed); if ($unread > 0) { @@ -2406,15 +2406,19 @@ if ($cat_view) { if ($feed > 0) { - # sub-cats - $subcats = getChildCategories($link, $feed, $owner_uid); - - if (count($subcats) == 0) { - $query_strategy_part = "cat_id = '$feed'"; + if ($include_children) { + # sub-cats + $subcats = getChildCategories($link, $feed, $owner_uid); + + if (count($subcats) == 0) { + $query_strategy_part = "cat_id = '$feed'"; + } else { + array_push($subcats, $feed); + $query_strategy_part = "cat_id IN (". + implode(",", $subcats).")"; + } } else { - array_push($subcats, $feed); - $query_strategy_part = "cat_id IN (". - implode(",", $subcats).")"; + $query_strategy_part = "cat_id = '$feed'"; } } else { diff --git a/index.php b/index.php index c17a10416..96d13558d 100644 --- a/index.php +++ b/index.php @@ -183,6 +183,14 @@ +   + + + + diff --git a/js/tt-rss.js b/js/tt-rss.js index a4c67bfcc..11d5ef9c1 100644 --- a/js/tt-rss.js +++ b/js/tt-rss.js @@ -42,6 +42,14 @@ function setActiveFeedId(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) { exception_error("setActiveFeedId", e); } -- cgit v1.2.3-54-g00ecf From 854a2ace869b29f805d203bb74968ef1500eb54b Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 13 Aug 2012 21:39:40 +0400 Subject: change include_children to a togglebutton; add placeholder setting save in a session --- classes/feeds.php | 4 +++- include/functions.php | 1 + index.php | 9 +++++++-- js/feedlist.js | 1 + js/tt-rss.js | 18 ++++++++++-------- 5 files changed, 22 insertions(+), 11 deletions(-) (limited to 'js/tt-rss.js') diff --git a/classes/feeds.php b/classes/feeds.php index 502efd401..be7886472 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -764,7 +764,7 @@ class Feeds extends Protected_Handler { @$offset = db_escape_string($_REQUEST["skip"]); @$vgroup_last_feed = db_escape_string($_REQUEST["vgrlf"]); $order_by = db_escape_string($_REQUEST["order_by"]); - $include_children = $_REQUEST["include_children"] == "on"; + $include_children = $_REQUEST["include_children"] == "true"; if (is_numeric($feed)) $feed = (int) $feed; @@ -806,6 +806,8 @@ class Feeds extends Protected_Handler { set_pref($this->link, "_DEFAULT_VIEW_LIMIT", $limit); set_pref($this->link, "_DEFAULT_VIEW_ORDER_BY", $order_by); + $_SESSION["_DEFAULT_INCLUDE_CHILDREN"] = $include_children; + if (!$cat_view && preg_match("/^[0-9][0-9]*$/", $feed)) { db_query($this->link, "UPDATE ttrss_feeds SET last_viewed = NOW() WHERE id = '$feed' AND owner_uid = ".$_SESSION["uid"]); diff --git a/include/functions.php b/include/functions.php index 3cb503fd8..cb24cb877 100644 --- a/include/functions.php +++ b/include/functions.php @@ -2137,6 +2137,7 @@ $params["icons_url"] = ICONS_URL; $params["cookie_lifetime"] = SESSION_COOKIE_LIFETIME; + $params["default_include_children"] = $_SESSION["_DEFAULT_INCLUDE_CHILDREN"]; $params["default_view_mode"] = get_pref($link, "_DEFAULT_VIEW_MODE"); $params["default_view_limit"] = (int) get_pref($link, "_DEFAULT_VIEW_LIMIT"); $params["default_view_order_by"] = get_pref($link, "_DEFAULT_VIEW_ORDER_BY"); diff --git a/index.php b/index.php index 96d13558d..3a68c90f6 100644 --- a/index.php +++ b/index.php @@ -185,11 +185,16 @@   - + --> + +