chylex/Nextcloud-News
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-News.git synced 2025-04-09 10:15:44 +02:00
Code

added more logic to the serverside moving feed into folder

Browse Source
This commit is contained in:
Bernhard Posselt 2012-08-16 13:17:24 +02:00
parent 00198b753d
commit d6fd252bb4
3 changed files with 25 additions and 10 deletions

19
ajax/movefeedtofolder.php
View File

@ -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();

14
js/news.js
View File

@ -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();
}
});

2
templates/part.items.header.php
View File

@ -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>