зеркало из https://github.com/nextcloud/news.git
fixed a bug that would prevent all new items from being loaded, fixed a bug that would send the wrong starred count to the webinterface
This commit is contained in:
Родитель
b5ea253fa6
Коммит
4dd641cb6f
|
@ -106,7 +106,7 @@ class NewsController extends Controller {
|
||||||
$itemMapper = new ItemMapper($this->userId);
|
$itemMapper = new ItemMapper($this->userId);
|
||||||
|
|
||||||
// starred or subscriptions
|
// starred or subscriptions
|
||||||
if ($feedType === FeedType::STARRED || $feedId === FeedType::SUBSCRIPTIONS) {
|
if ($feedType === FeedType::STARRED || $feedType === FeedType::SUBSCRIPTIONS) {
|
||||||
|
|
||||||
if($feedType === FeedType::STARRED){
|
if($feedType === FeedType::STARRED){
|
||||||
$statusFlag = StatusFlag::IMPORTANT;
|
$statusFlag = StatusFlag::IMPORTANT;
|
||||||
|
@ -141,7 +141,6 @@ class NewsController extends Controller {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return $items;
|
return $items;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -158,7 +157,7 @@ class NewsController extends Controller {
|
||||||
|
|
||||||
switch ($feedType) {
|
switch ($feedType) {
|
||||||
case FeedType::STARRED:
|
case FeedType::STARRED:
|
||||||
$unreadCount = $itemMapper->countAllStatus($feedId, StatusFlag::IMPORTANT);
|
$unreadCount = $itemMapper->countEveryItemByStatus(StatusFlag::IMPORTANT);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case FeedType::SUBSCRIPTIONS:
|
case FeedType::SUBSCRIPTIONS:
|
||||||
|
@ -181,12 +180,6 @@ class NewsController extends Controller {
|
||||||
return $unreadCount;
|
return $unreadCount;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function javascriptTests(){
|
|
||||||
$this->add3rdPartyScript('jasmine-1.2.0/jasmine.js');
|
|
||||||
$this->add3rdPartyStyle('jasmine-1.2.0/jasmine.css');
|
|
||||||
$this->render('javascript.tests');
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,14 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
class Test_News_MyTest extends UnitTestCase
|
||||||
|
{
|
||||||
|
|
||||||
|
public function testTest() {
|
||||||
|
$this->assertTrue(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
?>
|
Загрузка…
Ссылка в новой задаче