diff options
-rw-r--r-- | ajax/movefeedtofolder.php | 19 | ||||
-rw-r--r-- | js/news.js | 14 | ||||
-rw-r--r-- | templates/part.items.header.php | 2 |
3 files changed, 25 insertions, 10 deletions
diff --git a/ajax/movefeedtofolder.php b/ajax/movefeedtofolder.php index e4a78d28a..44dd1f022 100644 --- a/ajax/movefeedtofolder.php +++ b/ajax/movefeedtofolder.php @@ -16,8 +16,23 @@ OCP\JSON::checkAppEnabled('news'); OCP\JSON::callCheck(); $folderId = $_POST['folderId']; -$itemId = $_POST['itemId']; +$feedId = $_POST['feedId']; -// TODO: save + +$feedMapper = new OCA\News\FeedMapper(); +$feed = $feedMapper->findById($feedId); + +// FIXME: check if we're allowed to perform this action +//$feed->setFolder($folderId); +//$success = $feedMapper->update($feed); +$success = true; + +$l = OC_L10N::get('news'); + +if(!$success) { + OCP\JSON::error(array('data' => array('message' => $l->t('Error moving feed into folder.')))); + OCP\Util::writeLog('news','ajax/setallitemsread.php: Error moving feed ' . $feedId . ' into folder '. $folderId, OCP\Util::ERROR); + exit(); +} OCP\JSON::success();
\ No newline at end of file diff --git a/js/news.js b/js/news.js index 1c89fcc61..fcf00632f 100644 --- a/js/news.js +++ b/js/news.js @@ -344,28 +344,28 @@ News={ } }); }, - moveToFolder:function(folder, item){ + moveToFolder:function(folder, feed){ var folderId = $(folder).data('id'); - var itemId = $(item).data('id'); - if($(item).parent().parent().data('id') == folderId){ + var feedId = $(feed).data('id'); + if($(feed).parent().parent().data('id') == folderId){ // FIXME uncomment the return and remove the following lines // in the if part to prevent dropping in the same folder // return; folderId = 0; - $('#feeds > ul').append(item); + $('#feeds > ul').append(feed); } else { - $(folder).children('ul').append(item); + $(folder).children('ul').append(feed); } transformCollapsableTrigger(); data = { folderId: folderId, - itemId: itemId + feedId: feedId }; $.post(OC.filePath('news', 'ajax', 'movefeedtofolder.php'), data, function(jsondata){ if(jsondata.status != 'success'){ - OC.dialogs.alert(t('news', 'Error while saving the item in a folder'), t('news', 'Error')); + OC.dialogs.alert(t('news', 'Error while saving the feed in a folder'), t('news', 'Error')); window.location.reload(); } }); diff --git a/templates/part.items.header.php b/templates/part.items.header.php index 55c125aa0..c54a2ae65 100644 --- a/templates/part.items.header.php +++ b/templates/part.items.header.php @@ -28,7 +28,7 @@ $showOnlyUnread = true; <h1 title="<?php echo $feedTitle; ?>"><?php echo $feedTitle; ?></h1> </div> <div class="controls"> - <input type="button" value="<?php echo $l->t('Mark all as read'); ?>" id="mark_all_as_read" /> + <input type="button" value="<?php echo $l->t('Mark all read'); ?>" id="mark_all_as_read" /> <select id="feed_filter"> <option value="unread" <?php if($showOnlyUnread){ echo 'selected="selected"'; }; ?>><?php echo $l->t('Show only unread articles'); ?></option> <option value="all" <?php if(!$showOnlyUnread){ echo 'selected="selected"'; }; ?>><?php echo $l->t('Show read/unread articles'); ?></option> |