From 347000cc2d5597c1971942ebdbe97461c9fa5802 Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <nukeawhale@gmail.com>
Date: Fri, 10 May 2013 13:30:00 +0200
Subject: use a deleted flag for deleted feeds to handle undo

---
 appinfo/database.xml | 14 ++++++++++++++
 appinfo/info.xml     |  2 +-
 appinfo/routes.php   | 12 ++++++++++++
 appinfo/version      |  2 +-
 4 files changed, 28 insertions(+), 2 deletions(-)

(limited to 'appinfo')

diff --git a/appinfo/database.xml b/appinfo/database.xml
index af0073098..7d3cf2378 100644
--- a/appinfo/database.xml
+++ b/appinfo/database.xml
@@ -38,6 +38,13 @@
 				<default>true</default>
 				<notnull>true</notnull>
 			</field>
+			<field>
+				<name>deleted_at</name>
+				<type>integer</type>
+				<default>0</default>
+				<notnull>false</notnull>
+				<unsigned>true</unsigned>
+			</field>
 
 			<index>
 				<name>news_folders_parent_id_index</name>
@@ -106,6 +113,13 @@
 				<notnull>false</notnull>
 				<unsigned>true</unsigned>
 			</field>
+			<field>
+				<name>deleted_at</name>
+				<type>integer</type>
+				<default>0</default>
+				<notnull>false</notnull>
+				<unsigned>true</unsigned>
+			</field>
 			<field>
 				<name>folder_id</name>
 				<type>integer</type>
diff --git a/appinfo/info.xml b/appinfo/info.xml
index d20593797..4003fae84 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -5,6 +5,6 @@
 	<description>An RSS/Atom feed reader. Requires the App Framework app and backgroundjobs need to be enabled. See the README.rst in the apps top directory</description>
 	<licence>AGPL</licence>
 	<author>Alessandro Cosentino, Bernhard Posselt, Jan-Christoph Borchardt. Powered by SimplePie (Ryan Parman, Geoffrey Sneddon, Ryan McCue and contributors).</author>
-	<version>0.99</version>
+	<version>0.101</version>
 	<require>5.0.6</require>
 </info>
diff --git a/appinfo/routes.php b/appinfo/routes.php
index 28a6cadff..8c89d49fb 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -71,6 +71,12 @@ $this->create('news_folders_delete', '/folders/{folderId}/delete')->post()->acti
 	}
 );
 
+$this->create('news_folders_restore', '/folders/{folderId}/restore')->post()->action(
+	function($params){
+		App::main('FolderController', 'restore', $params, new DIContainer());
+	}
+);
+
 $this->create('news_folders_rename', '/folders/{folderId}/rename')->post()->action(
 	function($params){
 		App::main('FolderController', 'rename', $params, new DIContainer());
@@ -110,6 +116,12 @@ $this->create('news_feeds_delete', '/feeds/{feedId}/delete')->post()->action(
 	}
 );
 
+$this->create('news_feeds_restore', '/feeds/{feedId}/restore')->post()->action(
+	function($params){
+		App::main('FeedController', 'restore', $params, new DIContainer());
+	}
+);
+
 $this->create('news_feeds_update', '/feeds/{feedId}/update')->post()->action(
 	function($params){
 		App::main('FeedController', 'update', $params, new DIContainer());
diff --git a/appinfo/version b/appinfo/version
index f7274f3da..b4fad5b0f 100644
--- a/appinfo/version
+++ b/appinfo/version
@@ -1 +1 @@
-0.99
\ No newline at end of file
+0.101
\ No newline at end of file
-- 
cgit v1.2.3