Show or hide items in rightcontent when creating or deleting feeds

3 files changed, 26 insertions, 8 deletions

diff --git a/ajax/createfeed.php b/ajax/createfeed.php
index 364679189..0b05f3ab4 100644
--- a/ajax/createfeed.php
+++ b/ajax/createfeed.php
@@ -44,9 +44,13 @@ if($feed == null || !$feedid) {
 	exit();
 }
 
-$tmpl = new OCP\Template("news", "part.listfeed");
-$tmpl->assign('child', $feed);
-$listfeed = $tmpl->fetchPage();
+$tmpl_listfeed = new OCP\Template("news", "part.listfeed");
+$tmpl_listfeed->assign('child', $feed);
+$listfeed = $tmpl_listfeed->fetchPage();
 
-OCP\JSON::success(array('data' => array('message' => $l->t('Feed added!'), 'listfeed' => $listfeed)));
+$tmpl_items = new OCP\Template("news", "part.items");
+$tmpl_items->assign('feedid', $feedid);
+$part_items = $tmpl_items->fetchPage();
+
+OCP\JSON::success(array('data' => array( 'message' => $l->t('Feed added!'), 'listfeed' => $listfeed, 'part_items' => $part_items )));
 
diff --git a/ajax/deletefeed.php b/ajax/deletefeed.php
index d31a9417d..71574aa1b 100644
--- a/ajax/deletefeed.php
+++ b/ajax/deletefeed.php
@@ -4,10 +4,10 @@
 *
 * @author Alessandro Cosentino
 * Copyright (c) 2012 - Alessandro Cosentino <cosenal@gmail.com>
-* 
+*
 * This file is licensed under the Affero General Public License version 3 or later.
 * See the COPYING-README file
-* 
+*
 */
 
 // Check if we are a user
@@ -30,4 +30,7 @@ if(!$success) {
 	exit();
 }
 
-OCP\JSON::success(array('data' => array( 'feedid' => $feedid )));
+$tmpl = new OCP\Template("news", "part.items.deleted");
+$part_items = $tmpl->fetchPage();
+
+OCP\JSON::success(array('data' => array( 'feedid' => $feedid, 'part_items' => $part_items )));
diff --git a/ajax/deletefolder.php b/ajax/deletefolder.php
index 7c38557f6..65eec5bdf 100644
--- a/ajax/deletefolder.php
+++ b/ajax/deletefolder.php
@@ -18,6 +18,8 @@ OCP\JSON::callCheck();
 $userid = OCP\USER::getUser();
 
 $folderid = trim($_POST['folderid']);
+$shownfeedid = trim($_POST['shownfeedid']);
+$part_items = false;
 
 $foldermapper = new OC_News_FolderMapper();
 
@@ -27,4 +29,13 @@ if(!$foldermapper->deleteById($folderid)) {
 	exit();
 }
 
-OCP\JSON::success(array('data' => array( 'folderid' => $folderid )));
+// lets check if the currently shown feed is among the deleted feeds
+if ($shownfeedid != null) {
+	$feedmapper = new OC_News_FeedMapper();
+	if (!$feedmapper->findById($shownfeedid)) {
+		$tmpl = new OCP\Template("news", "part.items.deleted");
+		$part_items = $tmpl->fetchPage();
+	}
+}
+
+OCP\JSON::success(array('data' => array( 'folderid' => $folderid, 'part_items' => $part_items )));