diff options
| author | Bernhard Posselt <nukeawhale@gmail.com> | 2012-10-13 04:47:35 +0200 |
|---|---|---|
| committer | Bernhard Posselt <nukeawhale@gmail.com> | 2012-10-13 04:47:35 +0200 |
| commit | 4b5f94b435b4756e3aa9e1a3fad3820ce1389ba8 (patch) | |
| tree | 88b016195f4dbcf2deb6993d6ec029df7a05db8c /templates | |
| parent | 523f5304be09223b3b57a9df0452123e90f627e3 (diff) | |
selecting folders works
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/main.php | 1 | ||||
| -rw-r--r-- | templates/part.items.php | 23 |
2 files changed, 2 insertions, 22 deletions
diff --git a/templates/main.php b/templates/main.php index d0b0ec581..e2a27c324 100644 --- a/templates/main.php +++ b/templates/main.php @@ -20,7 +20,6 @@ if($_['showAll']) { } echo $this->inc("part.dialogues"); - ?> <div id="leftcontent_news" class="leftcontent_news"> diff --git a/templates/part.items.php b/templates/part.items.php index 296080eb8..e318a8466 100644 --- a/templates/part.items.php +++ b/templates/part.items.php @@ -1,25 +1,6 @@ <?php -$feedId = isset($_['lastViewedFeedId']) ? $_['lastViewedFeedId'] : ''; - -$itemMapper = new OCA\News\ItemMapper(); - -$showAll = OCP\Config::getUserValue(OCP\USER::getUser(), 'news', 'showAll'); - -$specialfeed = false; - -if ($feedId == -1 || $feedId == -2) { //TODO: change this values, too obscure - $specialfeed = true; - $status = ($feedId == -1) ? OCA\News\StatusFlag::IMPORTANT : OCA\News\StatusFlag::UNREAD; - $items = $itemMapper->findEveryItemByStatus($status); -} -else { - if($showAll) { - $items = $itemMapper->findByFeedId($feedId); - } else { - $items = $itemMapper->findAllStatus($feedId, OCA\News\StatusFlag::UNREAD); - } -} +$items = isset($_['items']) ? $_['items'] : ''; echo '<ul>'; foreach($items as $item) { @@ -38,7 +19,7 @@ foreach($items as $item) { $startTitle = $l->t('Mark as important'); } - echo '<li class="feed_item ' . $newsItemClass .'" data-id="' . $item->getId() . '" data-feedid="' . $feedId . '">'; + echo '<li class="feed_item ' . $newsItemClass .'" data-id="' . $item->getId() . '" data-feedid="' . $item->getFeedId() . '">'; echo '<span class="timestamp">' . $item->getDate() . '</span>'; echo '<h2 class="item_date"><time class="timeago" datetime="' . date('c', $item->getDate()) . '">' . date('F j, Y, g:i a', $item->getDate()) . '</time>' . '</h2>'; |