diff options
-rw-r--r-- | bl/feedbl.php | 3 | ||||
-rw-r--r-- | js/app/services/persistence.coffee | 24 | ||||
-rw-r--r-- | js/public/app.js | 24 | ||||
-rw-r--r-- | js/tests/services/persistenceSpec.coffee | 48 | ||||
-rw-r--r-- | templates/part.listfeed.php | 4 |
5 files changed, 52 insertions, 51 deletions
diff --git a/bl/feedbl.php b/bl/feedbl.php index 9af4d6198..a77f9bdd2 100644 --- a/bl/feedbl.php +++ b/bl/feedbl.php @@ -77,6 +77,9 @@ class FeedBl extends Bl { $this->itemMapper->insert($item); } + // set unread count + $feed->setUnreadCount(count($items)); + return $feed; } catch(FetcherException $ex){ $this->api->log($ex->getMessage()); diff --git a/js/app/services/persistence.coffee b/js/app/services/persistence.coffee index 8e0564002..24b371b54 100644 --- a/js/app/services/persistence.coffee +++ b/js/app/services/persistence.coffee @@ -86,7 +86,7 @@ angular.module('News').factory '_Persistence', -> Stars an item ### params = - urlParams: + routeParams: itemId: itemId @_request.post 'news_items_star', params @@ -98,7 +98,7 @@ angular.module('News').factory '_Persistence', -> Unstars an item ### params = - urlParams: + routeParams: itemId: itemId @_request.post 'news_items_unstar', params @@ -109,7 +109,7 @@ angular.module('News').factory '_Persistence', -> Sets an item as read ### params = - urlParams: + routeParams: itemId: itemId @_request.post 'news_items_read', params @@ -121,7 +121,7 @@ angular.module('News').factory '_Persistence', -> Sets an item as unread ### params = - urlParams: + routeParams: itemId: itemId @_request.post 'news_items_unread', params @@ -160,7 +160,7 @@ angular.module('News').factory '_Persistence', -> deleteFeed: (feedId) -> params = - urlParams: + routeParams: feedId: feedId @_request.post 'news_feeds_delete', params @@ -171,7 +171,7 @@ angular.module('News').factory '_Persistence', -> moves a feed to a new folder ### params = - urlParams: + routeParams: feedId: feedId data: folderId: folderId @@ -184,7 +184,7 @@ angular.module('News').factory '_Persistence', -> sets all items of a feed as read ### params = - urlParams: + routeParams: feedId: feedId data: highestItemId: highestItemId @@ -197,7 +197,7 @@ angular.module('News').factory '_Persistence', -> moves a feed to a new folder ### params = - urlParams: + routeParams: feedId: feedId @_request.post 'news_feeds_update', params @@ -219,7 +219,7 @@ angular.module('News').factory '_Persistence', -> Save if a folder was opened ### params = - urlParams: + routeParams: folderId: folderId @_request.post 'news_folders_open', params @@ -230,7 +230,7 @@ angular.module('News').factory '_Persistence', -> Save if a folder was collapsed ### params = - urlParams: + routeParams: folderId: folderId @_request.post 'news_folders_collapse', params @@ -256,7 +256,7 @@ angular.module('News').factory '_Persistence', -> Save if a folder was collapsed ### params = - urlParams: + routeParams: folderId: folderId @@ -268,7 +268,7 @@ angular.module('News').factory '_Persistence', -> Save if a folder was collapsed ### params = - urlParams: + routeParams: folderId: folderId data: folderName: folderName diff --git a/js/public/app.js b/js/public/app.js index 505eb558c..6a110adc7 100644 --- a/js/public/app.js +++ b/js/public/app.js @@ -1073,7 +1073,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. var params; params = { - urlParams: { + routeParams: { itemId: itemId } }; @@ -1087,7 +1087,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. var params; params = { - urlParams: { + routeParams: { itemId: itemId } }; @@ -1101,7 +1101,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. var params; params = { - urlParams: { + routeParams: { itemId: itemId } }; @@ -1115,7 +1115,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. var params; params = { - urlParams: { + routeParams: { itemId: itemId } }; @@ -1168,7 +1168,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. Persistence.prototype.deleteFeed = function(feedId) { var params; params = { - urlParams: { + routeParams: { feedId: feedId } }; @@ -1182,7 +1182,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. var params; params = { - urlParams: { + routeParams: { feedId: feedId }, data: { @@ -1199,7 +1199,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. var params; params = { - urlParams: { + routeParams: { feedId: feedId }, data: { @@ -1216,7 +1216,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. var params; params = { - urlParams: { + routeParams: { feedId: feedId } }; @@ -1244,7 +1244,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. var params; params = { - urlParams: { + routeParams: { folderId: folderId } }; @@ -1258,7 +1258,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. var params; params = { - urlParams: { + routeParams: { folderId: folderId } }; @@ -1296,7 +1296,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. var params; params = { - urlParams: { + routeParams: { folderId: folderId } }; @@ -1310,7 +1310,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. var params; params = { - urlParams: { + routeParams: { folderId: folderId }, data: { diff --git a/js/tests/services/persistenceSpec.coffee b/js/tests/services/persistenceSpec.coffee index 788b05539..091fcd60c 100644 --- a/js/tests/services/persistenceSpec.coffee +++ b/js/tests/services/persistenceSpec.coffee @@ -100,45 +100,45 @@ describe '_Persistence', -> it 'send a correct star item request', => params = - urlParams: + routeParams: itemId: 2 pers = new @_Persistence(@req, @loading, @config, @active, @$rootScope) - pers.starItem(params.urlParams.itemId) + pers.starItem(params.routeParams.itemId) expect(@req.post).toHaveBeenCalledWith('news_items_star', params) it 'send a correct unstar item request', => params = - urlParams: + routeParams: itemId: 2 pers = new @_Persistence(@req, @loading, @config, @active, @$rootScope) - pers.unstarItem(params.urlParams.itemId) + pers.unstarItem(params.routeParams.itemId) expect(@req.post).toHaveBeenCalledWith('news_items_unstar', params) it 'send a correct read item request', => params = - urlParams: + routeParams: itemId: 2 pers = new @_Persistence(@req, @loading, @config, @active, @$rootScope) - pers.readItem(params.urlParams.itemId) + pers.readItem(params.routeParams.itemId) expect(@req.post).toHaveBeenCalledWith('news_items_read', params) it 'send a correct unread item request', => params = - urlParams: + routeParams: itemId: 2 pers = new @_Persistence(@req, @loading, @config, @active, @$rootScope) - pers.unreadItem(params.urlParams.itemId) + pers.unreadItem(params.routeParams.itemId) expect(@req.post).toHaveBeenCalledWith('news_items_unread', params) @@ -162,11 +162,11 @@ describe '_Persistence', -> params = data: folderId: 4 - urlParams: + routeParams: feedId: 3 pers = new @_Persistence(@req, @loading, @config, @active, @$rootScope) - pers.moveFeed(params.urlParams.feedId, params.data.folderId) + pers.moveFeed(params.routeParams.feedId, params.data.folderId) expect(@req.post).toHaveBeenCalledWith('news_feeds_move', params) @@ -175,11 +175,11 @@ describe '_Persistence', -> params = data: highestItemId: 4 - urlParams: + routeParams: feedId: 3 pers = new @_Persistence(@req, @loading, @config, @active, @$rootScope) - pers.setFeedRead(params.urlParams.feedId, params.data.highestItemId) + pers.setFeedRead(params.routeParams.feedId, params.data.highestItemId) expect(@req.post).toHaveBeenCalledWith('news_feeds_read', params) @@ -187,11 +187,11 @@ describe '_Persistence', -> it 'send a correct feed update request', => params = - urlParams: + routeParams: feedId: 3 pers = new @_Persistence(@req, @loading, @config, @active, @$rootScope) - pers.updateFeed(params.urlParams.feedId) + pers.updateFeed(params.routeParams.feedId) expect(@req.post).toHaveBeenCalledWith('news_feeds_update', params) @@ -208,11 +208,11 @@ describe '_Persistence', -> it 'send a correct feed delete request', => params = - urlParams: + routeParams: feedId: 3 pers = new @_Persistence(@req, @loading, @config, @active, @$rootScope) - pers.deleteFeed(params.urlParams.feedId) + pers.deleteFeed(params.routeParams.feedId) expect(@req.post).toHaveBeenCalledWith('news_feeds_delete', params) @@ -248,22 +248,22 @@ describe '_Persistence', -> it 'send a correct collapse folder request', => params = - urlParams: + routeParams: folderId: 3 pers = new @_Persistence(@req, @loading, @config, @active, @$rootScope) - pers.collapseFolder(params.urlParams.folderId) + pers.collapseFolder(params.routeParams.folderId) expect(@req.post).toHaveBeenCalledWith('news_folders_collapse', params) it 'send a correct open folder request', => params = - urlParams: + routeParams: folderId: 3 pers = new @_Persistence(@req, @loading, @config, @active, @$rootScope) - pers.openFolder(params.urlParams.folderId) + pers.openFolder(params.routeParams.folderId) expect(@req.post).toHaveBeenCalledWith('news_folders_open', params) @@ -285,24 +285,24 @@ describe '_Persistence', -> it 'should do a proper folder delete request', => params = - urlParams: + routeParams: folderId: 2 pers = new @_Persistence(@req, @loading, @config, @active, @$rootScope) - pers.deleteFolder(params.urlParams.folderId) + pers.deleteFolder(params.routeParams.folderId) expect(@req.post).toHaveBeenCalledWith('news_folders_delete', params) it 'should do a proper folder rename request', => params = - urlParams: + routeParams: folderId: 2 data: folderName: 'host' pers = new @_Persistence(@req, @loading, @config, @active, @$rootScope) - pers.renameFolder(params.urlParams.folderId, params.data.folderName) + pers.renameFolder(params.routeParams.folderId, params.data.folderName) expect(@req.post).toHaveBeenCalledWith('news_folders_rename', params) diff --git a/templates/part.listfeed.php b/templates/part.listfeed.php index a6193afe7..2f136801c 100644 --- a/templates/part.listfeed.php +++ b/templates/part.listfeed.php @@ -11,7 +11,7 @@ href="#" class="title" ng-click="loadFeed(feedType.Feed, feed.id)"> - {{feed.name}} + {{feed.title}} </a> <span class="utils"> @@ -28,7 +28,5 @@ ng-click="markAllRead(feedType.Feed, feed.id)" title="<?php p($l->t('Mark all read')); ?>"></button> - - </span> </li> |