From: Andrew Dolgov <fox@bah.spb.su>
Date: Sun, 18 Jan 2009 15:29:25 +0000 (+0100)
Subject: remove label: do not reload headlines
X-Git-Tag: 1.3.0~71
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=1c9c602534e9a0aab5426d91f96b07ff31deabc6;p=tt-rss.git

remove label: do not reload headlines
---

diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php
index 3ec7df9e..a6ab9340 100644
--- a/modules/backend-rpc.php
+++ b/modules/backend-rpc.php
@@ -431,14 +431,33 @@
 
 			$label = label_find_caption($link, $label_id, $_SESSION["uid"]);
 
+			print "<rpc-reply>";
+			print "<info-for-headlines>";
+
 			if ($label) {
 
 				foreach ($ids as $id) {
 					label_remove_article($link, $id, $label, $_SESSION["uid"]);
+
+					print "<entry id=\"$id\"><![CDATA[";
+
+					$labels = get_article_labels($link, $id, $_SESSION["uid"]);
+
+					foreach ($labels as $l) {
+						print  "<span class='hlLabelRef'>".$l[1]."</span>";
+					}
+
+					print "]]></entry>";
+
 				}
 			}
 
-			print "<rpc-reply>OK</rpc-reply>";
+			print "</info-for-headlines>";
+
+			print "<counters>";
+			getAllCounters($link, $omode);
+			print "</counters>";
+			print "</rpc-reply>";
 
 			return;
 		}
diff --git a/viewfeed.js b/viewfeed.js
index 09b149ae..e5f1f8ae 100644
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -873,7 +873,8 @@ function selectionRemoveLabel(id) {
 
 			new Ajax.Request(query, {
 				onComplete: function(transport) { 
-					viewCurrentFeed();
+					show_labels_in_headlines(transport);
+					all_counters_callback2(transport);
 				} });
 
 		}