summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2016-04-17 16:47:02 +0200
committerBernhard Posselt <dev@bernhard-posselt.com>2016-04-17 16:47:11 +0200
commitd74b8cf43e3365618078ed1750a75bb8a440ee31 (patch)
treef68c6323e1aadb103f7c47c6ad1d4f5f00f406aa
parentd08dd536d77d494a08a8ecbd49feaf817fab2c88 (diff)
Fix #977
-rw-r--r--CHANGELOG.md3
-rw-r--r--db/feed.php4
-rw-r--r--tests/unit/db/FeedTest.php4
3 files changed, 9 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e70ed0d0..fd7fedb30 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+owncloud-news (8.6.0)
+* **Enhancement**: Also publish error count and last error message through API, #977
+
owncloud-news (8.5.0)
* **Bugfix**: Do not run feed updates when ajax or web cron mode was detected because it can lead to very long load times, timeouts, data corruption, update bugs where feeds are not updated anymore and database inconsistencies. If someone is interested in re-enabling webcron based feed updates, please create a PHP script which uses the [updater API](https://github.com/owncloud/news/wiki/Updater-1.2). Don't hesitate to ask for help on the issue tracker!
* **Bugfix**: Fix multiple error messages and outdated links for cron error messages
diff --git a/db/feed.php b/db/feed.php
index 1258c2d13..3a8444276 100644
--- a/db/feed.php
+++ b/db/feed.php
@@ -160,7 +160,9 @@ class Feed extends Entity implements IAPI, \JsonSerializable {
'unreadCount',
'ordering',
'link',
- 'pinned'
+ 'pinned',
+ 'updateErrorCount',
+ 'lastUpdateError'
]);
}
diff --git a/tests/unit/db/FeedTest.php b/tests/unit/db/FeedTest.php
index 63a32328e..25d2e4be2 100644
--- a/tests/unit/db/FeedTest.php
+++ b/tests/unit/db/FeedTest.php
@@ -54,7 +54,9 @@ class FeedTest extends \PHPUnit_Framework_TestCase {
'unreadCount' => 321,
'ordering' => 2,
'pinned' => true,
- 'link' => 'https://www.google.com/some/weird/path'
+ 'link' => 'https://www.google.com/some/weird/path',
+ 'updateErrorCount' => 2,
+ 'lastUpdateError' => 'hi'
], $feed->toAPI());
}