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

quickAddFilter: prefill current feed in the dialog

This commit is contained in:
Andrew Dolgov 2012-08-26 16:54:47 +04:00
parent 4c9d0490c6
commit da1da2e4d8
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
classes/dlg.php
View File

@ -445,7 +445,8 @@ class Dlg extends Handler_Protected {
}
function quickAddFilter() {
$active_feed_id = db_escape_string($_REQUEST["param"]);
$active_feed_id = (int) db_escape_string($_REQUEST["feed"]);
$cat_filter = db_escape_string($_REQUEST["is_cat"]) == "true";
print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"pref-filters\">";
print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"quiet\" value=\"1\">";
@ -497,7 +498,8 @@ class Dlg extends Handler_Protected {
print __("in") . " ";
print "<span id='filterDlg_feeds'>";
print_feed_select($this->link, "feed_id", $active_feed_id,
print_feed_select($this->link, "feed_id",
$cat_filter ? "CAT:$active_feed_id" : $active_feed_id,
'dojoType="dijit.form.FilteringSelect"');
print "</span>";

9
js/functions.js
View File

@ -940,7 +940,14 @@ function quickAddFeed() {
function quickAddFilter() {
try {
var query = "backend.php?op=dlg&method=quickAddFilter";
var query = "";
if (!inPreferences()) {
query = "backend.php?op=dlg&method=quickAddFilter&feed=" +
param_escape(getActiveFeedId()) + "&is_cat=" +
param_escape(activeFeedIsCat());
} else {
query = "backend.php?op=dlg&method=quickAddFilter";
}
if (dijit.byId("feedEditDlg"))
dijit.byId("feedEditDlg").destroyRecursive();