diff options
| author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-04-11 19:56:36 +0200 |
|---|---|---|
| committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-04-11 19:56:36 +0200 |
| commit | a9fb379b370a71f268dd501bc6a4e4d04eacc500 (patch) | |
| tree | 6b61ea0042cb23e4fa3d07fa2938894ee4b24361 /js | |
| parent | f16b8e1d92d68b158555fd3a06a784fae22cf353 (diff) | |
make moving feeds work, fix #22
Diffstat (limited to 'js')
| -rw-r--r-- | js/app/controllers/feedcontroller.coffee | 2 | ||||
| -rw-r--r-- | js/app/services/persistence.coffee | 2 | ||||
| -rw-r--r-- | js/public/app.js | 4 | ||||
| -rw-r--r-- | js/tests/services/persistenceSpec.coffee | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/js/app/controllers/feedcontroller.coffee b/js/app/controllers/feedcontroller.coffee index a660007e6..5299ead03 100644 --- a/js/app/controllers/feedcontroller.coffee +++ b/js/app/controllers/feedcontroller.coffee @@ -95,7 +95,7 @@ angular.module('News').factory '_FeedController', @_$scope.$on 'moveFeedToFolder', (scope, data) => - console.log data + @_feedBl.move(data.feedId, data.folderId) return FeedController diff --git a/js/app/services/persistence.coffee b/js/app/services/persistence.coffee index 7d0ecd5a0..b6a9cd2c6 100644 --- a/js/app/services/persistence.coffee +++ b/js/app/services/persistence.coffee @@ -175,7 +175,7 @@ angular.module('News').factory '_Persistence', -> routeParams: feedId: feedId data: - folderId: folderId + parentFolderId: folderId @_request.post 'news_feeds_move', params diff --git a/js/public/app.js b/js/public/app.js index 2aaaa05c0..761f2fac7 100644 --- a/js/public/app.js +++ b/js/public/app.js @@ -336,7 +336,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. } }; this._$scope.$on('moveFeedToFolder', function(scope, data) { - return console.log(data); + return _this._feedBl.move(data.feedId, data.folderId); }); } @@ -2074,7 +2074,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. feedId: feedId }, data: { - folderId: folderId + parentFolderId: folderId } }; return this._request.post('news_feeds_move', params); diff --git a/js/tests/services/persistenceSpec.coffee b/js/tests/services/persistenceSpec.coffee index 2934fdfb5..28c13b06d 100644 --- a/js/tests/services/persistenceSpec.coffee +++ b/js/tests/services/persistenceSpec.coffee @@ -163,12 +163,12 @@ describe '_Persistence', -> it 'create a correct request for moving a feed', => params = data: - folderId: 4 + parentFolderId: 4 routeParams: feedId: 3 pers = new @_Persistence(@req, @loading, @config, @active, @$rootScope) - pers.moveFeed(params.routeParams.feedId, params.data.folderId) + pers.moveFeed(params.routeParams.feedId, params.data.parentFolderId) expect(@req.post).toHaveBeenCalledWith('news_feeds_move', params) |