diff options
| -rw-r--r-- | ajax/createfeed.php | 4 | ||||
| -rw-r--r-- | js/news.js | 4 | ||||
| -rw-r--r-- | lib/folder.php | 10 | ||||
| -rw-r--r-- | templates/part.addfeed.php | 2 | ||||
| -rw-r--r-- | templates/part.addfolder.php | 3 |
5 files changed, 12 insertions, 11 deletions
diff --git a/ajax/createfeed.php b/ajax/createfeed.php index 35a403278..754d87495 100644 --- a/ajax/createfeed.php +++ b/ajax/createfeed.php @@ -18,11 +18,11 @@ OCP\JSON::callCheck(); $userid = OCP\USER::getUser(); $feedurl = trim($_POST['feedurl']); -//$folderid = trim($_POST['folderid']); +$folderid = trim($_POST['folderid']); $feed = OC_News_Utils::fetch($feedurl); $feedmapper = new OC_News_FeedMapper(); -$feedid = $feedmapper->save($feed, 0); //$folderid); +$feedid = $feedmapper->save($feed, $folderid); $l = OC_L10N::get('news'); diff --git a/js/news.js b/js/news.js index adacbfd63..a2e180aca 100644 --- a/js/news.js +++ b/js/news.js @@ -55,7 +55,7 @@ News={ //translation here!!! $(button).prop('value', 'Adding...'); - var folderid = $('#folder_parentfolder').find(':input[name="folderid"]').val(); + var folderid = $('#inputfolderid:input[name="folderid"]').val(); var url; url = OC.filePath('news', 'ajax', 'createfolder.php'); @@ -105,7 +105,7 @@ News={ //translation here!!! $(button).prop('value', 'Adding...'); - var folderid = $('#feed_parentfolder').find(':input[name="folderid"]').val(); + var folderid = $('#inputfolderid:input[name="folderid"]').val(); var url; url = OC.filePath('news', 'ajax', 'createfeed.php'); diff --git a/lib/folder.php b/lib/folder.php index a44630b9c..6654b2f5e 100644 --- a/lib/folder.php +++ b/lib/folder.php @@ -4,10 +4,10 @@ * * @author Alessandro Cosentino * Copyright (c) 2012 - Alessandro Cosentino <cosenal@gmail.com> -* +* * This file is licensed under the Affero General Public License version 3 or later. * See the COPYING-README file -* +* */ /** @@ -19,7 +19,7 @@ class OC_News_Folder extends OC_News_Collection { private $children; private $parent; - public function __construct($name, $id = null, $parent = null){ + public function __construct($name, $id = null, OC_News_Collection $parent = null){ $this->name = $name; if ($id !== null){ parent::__construct($id); @@ -44,11 +44,11 @@ class OC_News_Folder extends OC_News_Collection { } return $this->parent->getId(); } - + public function addChild(OC_News_Collection $child){ $this->children[] = $child; } - + public function getChildren(){ return $this->children; } diff --git a/templates/part.addfeed.php b/templates/part.addfeed.php index 522d60b32..6807f3c5b 100644 --- a/templates/part.addfeed.php +++ b/templates/part.addfeed.php @@ -8,7 +8,7 @@ <button id="dropdownBtn" onclick="News.DropDownMenu.dropdown(this)"> <?php echo $l->t('EVERYTHING'); ?> </button> - <input type="hidden" name="folderid" value="0" /> + <input id="inputfolderid" type="hidden" name="folderid" value="0" /> <ul class="menu" id="dropdownmenu"> <?php echo $this->inc("part.folderlist"); ?> </ul> diff --git a/templates/part.addfolder.php b/templates/part.addfolder.php index a4f6466ac..e1217160c 100644 --- a/templates/part.addfolder.php +++ b/templates/part.addfolder.php @@ -1,13 +1,14 @@ <div id="addfolder_dialog" title="<?php echo $l->t("Add Folder"); ?>"> <table width="100%" style="border: 0;"> +<tr> <td>Add new folder</td> <td> <div class="add_parentfolder"> <button id="dropdownBtn" onclick="News.DropDownMenu.dropdown(this)"> <?php echo $l->t('EVERYTHING'); ?> </button> - <input type="hidden" name="folderid" value="0" /> + <input id="inputfolderid" type="hidden" name="folderid" value="0" /> <ul class="menu" id="dropdownmenu"> <?php echo $this->inc("part.folderlist"); ?> </ul> |