Merge branch '7.1.9' into 7.2.0

Conflicts:
	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
This commit is contained in:
Shannon
2014-11-18 10:52:50 +11:00
3 changed files with 50 additions and 29 deletions

View File

@@ -149,8 +149,14 @@ function listViewController($rootScope, $scope, $routeParams, $injector, notific
});
}
//NOTE: This might occur if we are requesting a higher page number than what is actually available, for example
// if you have more than one page and you delete all items on the last page. In this case, we need to reset to the last
// available page and then re-load again
if ($scope.options.pageNumber > $scope.listViewResultSet.totalPages) {
$scope.options.pageNumber = $scope.listViewResultSet.totalPages;
//reload!
$scope.reloadView(id);
}
$scope.pagination = [];