]> git.wh0rd.org - tt-rss.git/commitdiff
quickAddFeed: fix legacy feed_id type being passed to newrule
authorAndrew Dolgov <noreply@fakecake.org>
Sun, 2 Jul 2017 19:50:44 +0000 (22:50 +0300)
committerAndrew Dolgov <noreply@fakecake.org>
Sun, 2 Jul 2017 19:50:44 +0000 (22:50 +0300)
js/functions.js
js/tt-rss.js

index 934f69e96c7f5db1aa5ea9ce1780577d3de4b636..aff20a33cf23c895f0e193ea4bd68d3635157434 100755 (executable)
@@ -1083,7 +1083,7 @@ function quickAddFilter() {
                                var feed_id = activeFeedIsCat() ? 'CAT:' + parseInt(getActiveFeedId()) :
                                        getActiveFeedId();
 
-                               var rule = { reg_exp: selectedText, feed_id: feed_id, filter_type: 1 };
+                               var rule = { reg_exp: selectedText, feed_id: [feed_id], filter_type: 1 };
 
                                addFilterRule(null, dojo.toJson(rule));
 
@@ -1107,7 +1107,7 @@ function quickAddFilter() {
                                                var feed_id = activeFeedIsCat() ? 'CAT:' + parseInt(getActiveFeedId()) :
                                                        getActiveFeedId();
 
-                                               var rule = { reg_exp: title, feed_id: feed_id, filter_type: 1 };
+                                               var rule = { reg_exp: title, feed_id: [feed_id], filter_type: 1 };
 
                                                addFilterRule(null, dojo.toJson(rule));
                                        }
index c51e25db5940b1445eca54838256302f684778f8..1872ad1ab230157e88472427800a569c655f987a 100644 (file)
@@ -228,6 +228,7 @@ function init() {
                        "dijit/form/Form",
                        "dijit/form/RadioButton",
                        "dijit/form/Select",
+               "dijit/form/MultiSelect",
                        "dijit/form/SimpleTextarea",
                        "dijit/form/TextBox",
                        "dijit/form/ComboBox",