yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include sort and filter in list view back link

Browse Source
This commit is contained in:
Kenn Jacobsen
2019-08-24 20:22:53 +02:00
committed by Sebastiaan Janssen
parent 3163b5f2fe
commit 30cf2fd4b2
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
View File

@@ -62,11 +62,13 @@
function init() {
var content = $scope.content;
if (content.id && content.isChildOfListView && content.trashed === false) {
$scope.page.listViewPath = ($routeParams.page) ?
"/content/content/edit/" + content.parentId + "?page=" + $routeParams.page :
"/content/content/edit/" + content.parentId;
$scope.page.listViewPath = "/content/content/edit/" + content.parentId
+ "?list=" + $routeParams.list
+ "&page=" + $routeParams.page
+ "&filter=" + $routeParams.filter
+ "&orderBy=" + $routeParams.orderBy
+ "&orderDirection=" + $routeParams.orderDirection;
}
// we need to check wether an app is present in the current data, if not we will present the default app.

13
src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
View File

@@ -44,7 +44,9 @@ function listViewController($scope, $routeParams, $injector, $timeout, currentUs
return selected.id;
};
createEditUrlCallback = function (item) {
return "/" + $scope.entityType + "/" + $scope.entityType + "/edit/" + item.id + "?page=" + $scope.options.pageNumber;
return "/" + $scope.entityType + "/" + $scope.entityType + "/edit/" + item.id
+ "?list=" + $routeParams.id + "&page=" + $scope.options.pageNumber + "&filter=" + $scope.options.filter
+ "&orderBy=" + $scope.options.orderBy + "&orderDirection=" + $scope.options.orderDirection;
};
}
@@ -143,12 +145,13 @@ function listViewController($scope, $routeParams, $injector, $timeout, currentUs
}
var listParamsForCurrent = $routeParams.id == $routeParams.list;
$scope.options = {
pageSize: $scope.model.config.pageSize ? $scope.model.config.pageSize : 10,
pageNumber: ($routeParams.page && Number($routeParams.page) != NaN && Number($routeParams.page) > 0) ? $routeParams.page : 1,
filter: '',
orderBy: ($scope.model.config.orderBy ? $scope.model.config.orderBy : 'VersionDate').trim(),
orderDirection: $scope.model.config.orderDirection ? $scope.model.config.orderDirection.trim() : "desc",
pageNumber: (listParamsForCurrent && $routeParams.page && Number($routeParams.page) != NaN && Number($routeParams.page) > 0) ? $routeParams.page : 1,
filter: (listParamsForCurrent && $routeParams.filter ? $routeParams.filter : '').trim(),
orderBy: (listParamsForCurrent && $routeParams.orderBy ? $routeParams.orderBy : $scope.model.config.orderBy ? $scope.model.config.orderBy : 'VersionDate').trim(),
orderDirection: (listParamsForCurrent && $routeParams.orderDirection ? $routeParams.orderDirection : $scope.model.config.orderDirection ? $scope.model.config.orderDirection : "desc").trim(),
orderBySystemField: true,
includeProperties: $scope.model.config.includeProperties ? $scope.model.config.includeProperties : [
{ alias: 'updateDate', header: 'Last edited', isSystem: 1 },