diff options
| -rw-r--r-- | appinfo/routes.php | 8 | ||||
| -rw-r--r-- | js/app/services/persistence.coffee | 4 | ||||
| -rw-r--r-- | js/public/app.js | 4 | ||||
| -rw-r--r-- | js/tests/services/persistenceSpec.coffee | 5 |
4 files changed, 11 insertions, 10 deletions
diff --git a/appinfo/routes.php b/appinfo/routes.php index 8c89d49fb..f290c2e2b 100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -59,13 +59,13 @@ $this->create('news_folders_collapse', '/folders/{folderId}/collapse')->post()-> } ); -$this->create('news_folders_create', '/folders/create')->post()->action( +$this->create('news_folders_create', '/folders')->post()->action( function($params){ App::main('FolderController', 'create', $params, new DIContainer()); } ); -$this->create('news_folders_delete', '/folders/{folderId}/delete')->post()->action( +$this->create('news_folders_delete', '/folders/{folderId}')->delete()->action( function($params){ App::main('FolderController', 'delete', $params, new DIContainer()); } @@ -104,13 +104,13 @@ $this->create('news_feeds_active', '/feeds/active')->get()->action( } ); -$this->create('news_feeds_create', '/feeds/create')->post()->action( +$this->create('news_feeds_create', '/feeds')->post()->action( function($params){ App::main('FeedController', 'create', $params, new DIContainer()); } ); -$this->create('news_feeds_delete', '/feeds/{feedId}/delete')->post()->action( +$this->create('news_feeds_delete', '/feeds/{feedId}')->delete()->action( function($params){ App::main('FeedController', 'delete', $params, new DIContainer()); } diff --git a/js/app/services/persistence.coffee b/js/app/services/persistence.coffee index 98549b98f..9d94daea8 100644 --- a/js/app/services/persistence.coffee +++ b/js/app/services/persistence.coffee @@ -197,7 +197,7 @@ $rootScope) -> routeParams: feedId: feedId - @_request.post 'news_feeds_delete', params + @_request.delete 'news_feeds_delete', params restoreFeed: (feedId, onSuccess=null) -> @@ -329,7 +329,7 @@ $rootScope) -> routeParams: folderId: folderId - @_request.post 'news_folders_delete', params + @_request.delete 'news_folders_delete', params restoreFolder: (folderId, onSuccess=null) -> diff --git a/js/public/app.js b/js/public/app.js index 1d597f2ad..411814bcc 100644 --- a/js/public/app.js +++ b/js/public/app.js @@ -2668,7 +2668,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. feedId: feedId } }; - return this._request.post('news_feeds_delete', params); + return this._request["delete"]('news_feeds_delete', params); }; Persistence.prototype.restoreFeed = function(feedId, onSuccess) { @@ -2852,7 +2852,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. folderId: folderId } }; - return this._request.post('news_folders_delete', params); + return this._request["delete"]('news_folders_delete', params); }; Persistence.prototype.restoreFolder = function(folderId, onSuccess) { diff --git a/js/tests/services/persistenceSpec.coffee b/js/tests/services/persistenceSpec.coffee index 2f1607cff..0d0880a2b 100644 --- a/js/tests/services/persistenceSpec.coffee +++ b/js/tests/services/persistenceSpec.coffee @@ -28,6 +28,7 @@ describe 'Persistence', -> beforeEach module ($provide) => @req = get: jasmine.createSpy('get') + delete: jasmine.createSpy('delete') post: jasmine.createSpy('post') @config = itemBatchSize: 3 @@ -204,7 +205,7 @@ describe 'Persistence', -> @Persistence.deleteFeed(params.routeParams.feedId) - expect(@req.post).toHaveBeenCalledWith('news_feeds_delete', params) + expect(@req.delete).toHaveBeenCalledWith('news_feeds_delete', params) it 'send a correct feed restore request', => @@ -302,7 +303,7 @@ describe 'Persistence', -> @Persistence.deleteFolder(params.routeParams.folderId) - expect(@req.post).toHaveBeenCalledWith('news_folders_delete', params) + expect(@req.delete).toHaveBeenCalledWith('news_folders_delete', params) it 'send a correct folder restore request', => |