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

U4-8749: Initial implementation of the default sort order using the columns added instead of a fixed list

Browse Source
This commit is contained in:
Asbjørn Riis-Knudsen
2016-07-28 22:18:17 +02:00
parent 99a7aa53a1
commit 385c53936e
2 changed files with 61 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/sortby.prevalues.controller.js
View File

@@ -1,40 +1,67 @@
function sortByPreValsController($rootScope, $scope, localizationService) {
function sortByPreValsController($rootScope, $scope, localizationService, editorState) {
var propsPreValue = _.findWhere(editorState.current.preValues, { key: "includeProperties" });
$scope.sortByFields = [
{ value: "SortOrder", key: "general_sort" },
{ value: "Name", key: "general_name" },
{ value: "VersionDate", key: "content_updateDate" },
{ value: "Updater", key: "content_updatedBy" },
{ value: "CreateDate", key: "content_createDate" },
{ value: "Owner", key: "content_createBy" },
{ value: "ContentTypeAlias", key: "content_documentType" },
{ value: "Published", key: "content_isPublished" },
{ value: "Email", key: "general_email" },
{ value: "Username", key: "general_username" }
];
//now we'll localize these strings, for some reason the directive doesn't work inside of the select group with an ng-model declared
_.each($scope.sortByFields, function (e, i) {
localizationService.localize(e.key).then(function (v) {
e.name = v;
if(propsPreValue != undefined){
$scope.sortByFields = propsPreValue.value;
}
else {
$scope.sortByFields = [];
}
switch (e.value) {
case "Updater":
e.name += " (Content only)";
break;
case "Published":
e.name += " (Content only)";
break;
case "Email":
e.name += " (Members only)";
break;
case "Username":
e.name += " (Members only)";
break;
}
});
var existingValue = _.find($scope.sortByFields, function (e) {
return e.alias.toLowerCase() === $scope.model.value;
});
if (existingValue === undefined) {
//Existing value not found
//Set to first value
if($scope.sortByFields.length > 0){
$scope.model.value = $scope.sortByFields[0].alias;
}
}
else {
//Set the existing value
//The old implementation pre Umbraco 7.5 used PascalCase aliases, this uses camelCase, so this ensures that any previous value is set
$scope.model.value = existingValue.alias;
}
//$scope.sortByFields = [
// { value: "SortOrder", key: "general_sort" },
// { value: "Name", key: "general_name" },
// { value: "VersionDate", key: "content_updateDate" },
// { value: "Updater", key: "content_updatedBy" },
// { value: "CreateDate", key: "content_createDate" },
// { value: "Owner", key: "content_createBy" },
// { value: "ContentTypeAlias", key: "content_documentType" },
// { value: "Published", key: "content_isPublished" },
// { value: "Email", key: "general_email" },
// { value: "Username", key: "general_username" }
//];
////now we'll localize these strings, for some reason the directive doesn't work inside of the select group with an ng-model declared
//_.each($scope.sortByFields, function (e, i) {
// localizationService.localize(e.key).then(function (v) {
// e.name = v;
// switch (e.value) {
// case "Updater":
// e.name += " (Content only)";
// break;
// case "Published":
// e.name += " (Content only)";
// break;
// case "Email":
// e.name += " (Members only)";
// break;
// case "Username":
// e.name += " (Members only)";
// break;
// }
// });
//});
}

2
src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/sortby.prevalues.html
View File

@@ -1,5 +1,5 @@
<select ng-model="model.value"
ng-controller="Umbraco.PrevalueEditors.SortByListViewController"
ng-options="field.value as field.name for field in sortByFields">
ng-options="field.alias as field.header for field in sortByFields">
</select>