diff --git a/src/UI/Activity/History/HistoryCollection.js b/src/UI/Activity/History/HistoryCollection.js index 5eb4dc4f7..8c82b7988 100644 --- a/src/UI/Activity/History/HistoryCollection.js +++ b/src/UI/Activity/History/HistoryCollection.js @@ -50,7 +50,7 @@ var Collection = PageableCollection.extend({ }, sortMappings : { - 'movie' : { sortKey : 'movie.sortTitle' } + 'movie' : { sortKey : 'movie.title' } }, initialize : function(options) { diff --git a/src/UI/Movies/Index/MoviesIndexLayout.js b/src/UI/Movies/Index/MoviesIndexLayout.js index 3e16a7eb7..8e87390ba 100644 --- a/src/UI/Movies/Index/MoviesIndexLayout.js +++ b/src/UI/Movies/Index/MoviesIndexLayout.js @@ -38,7 +38,6 @@ module.exports = Marionette.Layout.extend({ label : 'Title', cell : MovieTitleCell, cellValue : 'this', - sortValue : 'sortTitle' }, { name : 'profileId', @@ -128,25 +127,13 @@ module.exports = Marionette.Layout.extend({ title : 'Title', name : 'title' }, - { - title : 'Seasons', - name : 'seasonCount' - }, { title : 'Quality', name : 'profileId' }, { - title : 'Network', - name : 'network' - }, - { - title : 'Next Airing', - name : 'nextAiring' - }, - { - title : 'Episodes', - name : 'percentOfEpisodes' + title : 'In Cinemas', + name : 'inCinemas' } ] }; @@ -170,27 +157,6 @@ module.exports = Marionette.Layout.extend({ tooltip : 'Monitored Only', icon : 'icon-sonarr-monitored', callback : this._setFilter - }, - { - key : 'continuing', - title : '', - tooltip : 'Continuing Only', - icon : 'icon-sonarr-series-continuing', - callback : this._setFilter - }, - { - key : 'ended', - title : '', - tooltip : 'Ended Only', - icon : 'icon-sonarr-series-ended', - callback : this._setFilter - }, - { - key : 'missing', - title : '', - tooltip : 'Missing', - icon : 'icon-sonarr-missing', - callback : this._setFilter } ] }; diff --git a/src/UI/Movies/MoviesCollection.js b/src/UI/Movies/MoviesCollection.js index 2df59e282..16d50298f 100644 --- a/src/UI/Movies/MoviesCollection.js +++ b/src/UI/Movies/MoviesCollection.js @@ -15,10 +15,10 @@ var Collection = PageableCollection.extend({ tableName : 'movie', state : { - sortKey : 'sortTitle', - order : -1, + sortKey : 'title', + order : 1, pageSize : 100000, - secondarySortKey : 'sortTitle', + secondarySortKey : 'title', secondarySortOrder : -1 }, @@ -73,7 +73,7 @@ var Collection = PageableCollection.extend({ sortMappings : { title : { - sortKey : 'sortTitle' + sortKey : 'title' }, nextAiring : { diff --git a/src/UI/Shared/Toolbar/Sorting/SortingButtonView.js b/src/UI/Shared/Toolbar/Sorting/SortingButtonView.js index 6f6833ed2..a2c9bc0d9 100644 --- a/src/UI/Shared/Toolbar/Sorting/SortingButtonView.js +++ b/src/UI/Shared/Toolbar/Sorting/SortingButtonView.js @@ -67,4 +67,4 @@ module.exports = Marionette.ItemView.extend({ _removeSortIcon : function() { this.ui.icon.removeClass('icon-sonarr-sort-asc icon-sonarr-sort-desc'); } -}); \ No newline at end of file +});