From cc1dc2ed30486780f7ac46141c731dfe2da8e2de Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Fri, 12 Sep 2014 05:28:09 +0200 Subject: working on creating folders --- js/controller/NavigationController.js | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) (limited to 'js/controller') diff --git a/js/controller/NavigationController.js b/js/controller/NavigationController.js index 6c326aa95..c1eb8dcf5 100644 --- a/js/controller/NavigationController.js +++ b/js/controller/NavigationController.js @@ -132,28 +132,34 @@ function ($route, FEED_TYPE, FeedResource, FolderResource, ItemResource, this.newFolder = false; var self = this; + var folderName = feed.folder; + var folderId = feed.folderId || {id: 0}; // we dont need to create a new folder - if (feed.folder === undefined) { - FeedResource.create(feed.url, feed.folderId, undefined) + if (folderName === undefined) { + folderId.getsFeed = true; + + FeedResource.create(feed.url, folderId.id, undefined) .then(function (data) { Publisher.publishAll(data); + // set folder as default + var createdFeed = data.feeds[0]; + // load created feed - $location.path('/items/feeds/' + data.feeds[0].id); + $location.path('/items/feeds/' + createdFeed.id); + folderId.getsFeed = undefined; + }, function () { + folderId.getsFeed = undefined; }); } else { // create folder first and then the feed - FolderResource.create(feed.folder).then(function (data) { + FolderResource.create(folderName).then(function (data) { Publisher.publishAll(data); - self.createFeed({ - url: feed.url, - folderId: data.name - }); - - feed.folderId = data.name; - feed.folder = ''; + feed.folderId = data.folders[0]; + feed.folder = undefined; + self.createFeed(feed); }); } -- cgit v1.2.3