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

filterEditDlg: automatically open new rule dialog when active feed or article title present

This commit is contained in:
Andrew Dolgov 2012-08-31 17:33:22 +04:00
parent 84d9750edc
commit ab564aef7b
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
classes/pref/filters.php
View File

@ -615,9 +615,6 @@ class Pref_Filters extends Handler_Protected {
print "<form name='filter_new_form' id='filter_new_form'>"; print "<form name='filter_new_form' id='filter_new_form'>";
$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=\"op\" value=\"pref-filters\">";
print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"add\">"; print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"add\">";
print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"csrf_token\" value=\"".$_SESSION['csrf_token']."\">"; print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"csrf_token\" value=\"".$_SESSION['csrf_token']."\">";

21
js/functions.js
View File

@ -1169,6 +1169,27 @@ function quickAddFilter() {
}, },
href: query}); href: query});
if (!inPreferences()) {
var lh = dojo.connect(dialog, "onLoad", function(){
dojo.disconnect(lh);
var title = $("PTITLE-FULL-" + active_post_id);
if (title || getActiveFeedId() || activeFeedIsCat()) {
if (title) title = title.innerHTML;
console.log(title + " " + getActiveFeedId());
var feed_id = activeFeedIsCat() ? 'CAT:' + parseInt(getActiveFeedId()) :
getActiveFeedId();
var rule = { reg_exp: title, feed_id: feed_id, filter_type: 1 };
addFilterRule(null, dojo.toJson(rule));
}
});
}
dialog.show(); dialog.show();
} catch (e) { } catch (e) {