diff options
| author | Bernhard Posselt <nukeawhale@gmail.com> | 2012-08-15 18:03:32 +0200 |
|---|---|---|
| committer | Bernhard Posselt <nukeawhale@gmail.com> | 2012-08-15 18:03:32 +0200 |
| commit | 4faac81356c070f609d80f473032a7ed5552b98a (patch) | |
| tree | a34ba14bcf15ba4f5dac9657d59bc82fb5c1c734 | |
| parent | 084d70a217420b17ca3642f94599cd11f0d079af (diff) | |
fixed a bug that wouldnt let feeds show up nested in folders
| -rw-r--r-- | js/news.js | 4 | ||||
| -rw-r--r-- | lib/foldermapper.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/js/news.js b/js/news.js index 23380a66f..2647427a8 100644 --- a/js/news.js +++ b/js/news.js @@ -66,7 +66,7 @@ News={ if(folderid > 0){ $('.collapsable_container[data-id="' + folderid + '"] > ul').append(jsondata.data.listfolder); } else { - $('#feeds').append(jsondata.data.listfolder); + $('#feeds > ul').append(jsondata.data.listfolder); } setupFeedList(); transformCollapsableTrigger(); @@ -132,7 +132,7 @@ News={ if(folderid > 0){ $('.collapsable_container[data-id="' + folderid + '"] > ul').append(jsondata.data.listfeed); } else { - $('#feeds').append(jsondata.data.listfeed); + $('#feeds > ul').append(jsondata.data.listfeed); } setupFeedList(); News.Feed.load(jsondata.data.feedid); diff --git a/lib/foldermapper.php b/lib/foldermapper.php index 33a14a0c4..af7d9244a 100644 --- a/lib/foldermapper.php +++ b/lib/foldermapper.php @@ -68,7 +68,7 @@ class FolderMapper { while( $row = $result->fetchRow()){ $folderid = $row['id']; $folder = new Folder($row['name'], $folderid); - $children = self::childrenOf($folderid); + $children = self::childrenOfWithFeeds($folderid); $folder->addChildren($children); $collectionlist[] = $folder; } |