From: Andrew Dolgov <fox@bah.spb.su>
Date: Sun, 20 Aug 2006 13:40:03 +0000 (+0100)
Subject: sortable filter list
X-Git-Tag: schema_freeze_for_1.2.2_(take_2)~5
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=0e317f9d872f538fbf13f81e8a72272ab2c92e84;p=tt-rss.git

sortable filter list
---

diff --git a/backend.php b/backend.php
index 9b38303d..d9a4fe72 100644
--- a/backend.php
+++ b/backend.php
@@ -2101,6 +2101,12 @@
 
 		if ($quiet) return;
 
+		$sort = db_escape_string($_GET["sort"]);
+
+		if (!$sort || $sort == "undefined") {
+			$sort = "reg_exp";
+		}
+
 //		print "<div id=\"infoBoxShadow\"><div id=\"infoBox\">PLACEHOLDER</div></div>";
 
 		$result = db_query($link, "SELECT id,description 
@@ -2133,7 +2139,7 @@
 				filter_type = ttrss_filter_types.id AND
 				ttrss_filter_actions.id = action_id AND
 				ttrss_filters.owner_uid = ".$_SESSION["uid"]."
-			ORDER by reg_exp");
+			ORDER by $sort");
 
 		if (db_num_rows($result) != 0) {
 
@@ -2150,10 +2156,10 @@
 
 			print "<tr class=\"title\">
 						<td align='center' width=\"5%\">&nbsp;</td>
-						<td width=\"20%\">Filter expression</td>
-						<td width=\"20%\">Feed</td>
-						<td width=\"15%\">Match</td>
-						<td width=\"15%\">Action</td>";
+						<td width=\"20%\"><a href=\"javascript:updateFilterList('reg_exp')\">Filter expression</a></td>
+						<td width=\"20%\"><a href=\"javascript:updateFilterList('feed_title')\">Feed</a></td>
+						<td width=\"15%\"><a href=\"javascript:updateFilterList('filter_type')\">Match</a></td>
+						<td width=\"15%\"><a href=\"javascript:updateFilterList('action_description')\">Action</a></td>";
 
 			$lnum = 0;
 			
diff --git a/prefs.js b/prefs.js
index eabdd301..626d216a 100644
--- a/prefs.js
+++ b/prefs.js
@@ -1072,7 +1072,7 @@ function validateOpmlImport() {
 	}
 }
 
-function updateFilterList() {
+function updateFilterList(sort_key) {
 
 	if (!xmlhttp_ready(xmlhttp)) {
 		printLockingError();
@@ -1083,7 +1083,7 @@ function updateFilterList() {
 
 //	p_notify("Loading, please wait...");
 
-	xmlhttp.open("GET", "backend.php?op=pref-filters", true);
+	xmlhttp.open("GET", "backend.php?op=pref-filters&sort=" + param_escape(sort_key), true);
 	xmlhttp.onreadystatechange=filterlist_callback;
 	xmlhttp.send(null);