valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

headlines-frame: set is-vfeed attribute if result is virtual feed

This commit is contained in:
Andrew Dolgov 2019-01-16 21:33:59 +03:00
parent 17a8821c0b
commit 8b26b8629f
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
classes/feeds.php
View File

@ -209,6 +209,7 @@ class Feeds extends Handler_Protected {
make_local_datetime($qfh_ret[4], false) : __("Never"); make_local_datetime($qfh_ret[4], false) : __("Never");
$highlight_words = $qfh_ret[5]; $highlight_words = $qfh_ret[5];
$reply['first_id'] = $qfh_ret[6]; $reply['first_id'] = $qfh_ret[6];
$reply['is_vfeed'] = $qfh_ret[7];
$reply['search_query'] = [$search, $search_language]; $reply['search_query'] = [$search, $search_language];
$reply['vfeed_group_enabled'] = $vfeed_group_enabled; $reply['vfeed_group_enabled'] = $vfeed_group_enabled;
@ -1748,7 +1749,7 @@ class Feeds extends Handler_Protected {
$first_id = (int)$row["id"]; $first_id = (int)$row["id"];
if ($offset > 0 && $first_id && $check_first_id && $first_id != $check_first_id) { if ($offset > 0 && $first_id && $check_first_id && $first_id != $check_first_id) {
return array(-1, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words, $first_id); return array(-1, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words, $first_id, $vfeed_query_part != "");
} }
} }
} }
@ -1837,7 +1838,7 @@ class Feeds extends Handler_Protected {
$res = $pdo->query($query); $res = $pdo->query($query);
} }
return array($res, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words, $first_id); return array($res, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words, $first_id, $vfeed_query_part != "");
} }

3
js/Headlines.js
View File

@ -561,6 +561,9 @@ define(["dojo/_base/declare"], function (declare) {
$("headlines-frame").addClassName(App.isCombinedMode() ? "cdm" : "normal"); $("headlines-frame").addClassName(App.isCombinedMode() ? "cdm" : "normal");
$("headlines-frame").setAttribute("is-vfeed",
reply['headlines']['is_vfeed'] ? 1 : 0);
Article.setActive(0); Article.setActive(0);
try { try {