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

Merge pull request #1406 from arknu/U4-8749

Browse Source 
U4-8749: Allow default sort order to be custom properties
This commit is contained in:
Mads Rasmussen
2016-08-08 14:01:53 +02:00
committed by GitHub
parent 3170d6829a 2ddbca8861
commit cbd20cb9b3
6 changed files with 175 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Web.UI.Client/src/common/directives/components/umblistviewsettings.directive.js
View File

@@ -1,7 +1,7 @@
(function() {
'use strict';
function ListViewSettingsDirective(contentTypeResource, dataTypeResource, dataTypeHelper) {
function ListViewSettingsDirective(contentTypeResource, dataTypeResource, dataTypeHelper, listViewPrevalueHelper) {
function link(scope, el, attr, ctrl) {
@@ -20,6 +20,7 @@
scope.dataType = dataType;
listViewPrevalueHelper.setPrevalues(dataType.preValues);
scope.customListViewCreated = checkForCustomListView();
});

61
src/Umbraco.Web.UI.Client/src/common/services/listviewprevaluehelper.service.js Normal file
View File

@@ -0,0 +1,61 @@
/**
@ngdoc service
* @name umbraco.services.listViewPrevalueHelper
*
*
* @description
* Service for accessing the prevalues of a list view being edited in the inline list view editor in the doctype editor
*/
(function () {
'use strict';
function listViewPrevalueHelper() {
var prevalues = [];
/**
* @ngdoc method
* @name umbraco.services.listViewPrevalueHelper#getPrevalues
* @methodOf umbraco.services.listViewPrevalueHelper
*
* @description
* Set the collection of prevalues
*/
function getPrevalues() {
return prevalues;
}
/**
* @ngdoc method
* @name umbraco.services.listViewPrevalueHelper#setPrevalues
* @methodOf umbraco.services.listViewPrevalueHelper
*
* @description
* Changes the current layout used by the listview to the layout passed in. Stores selection in localstorage
*
* @param {Array} values Array of prevalues
*/
function setPrevalues(values) {
prevalues = values;
}
var service = {
getPrevalues: getPrevalues,
setPrevalues: setPrevalues
};
return service;
}
angular.module('umbraco.services').factory('listViewPrevalueHelper', listViewPrevalueHelper);
})();

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

@@ -151,7 +151,6 @@ function listViewController($rootScope, $scope, $routeParams, $injector, $cookie
layouts: $scope.model.config.layouts,
activeLayout: listViewHelper.getLayout($routeParams.id, $scope.model.config.layouts)
},
orderBySystemField: true,
allowBulkPublish: $scope.entityType === 'content' && $scope.model.config.bulkActionPermissions.allowBulkPublish,
allowBulkUnpublish: $scope.entityType === 'content' && $scope.model.config.bulkActionPermissions.allowBulkUnpublish,
allowBulkCopy: $scope.entityType === 'content' && $scope.model.config.bulkActionPermissions.allowBulkCopy,
@@ -159,6 +158,15 @@ function listViewController($rootScope, $scope, $routeParams, $injector, $cookie
allowBulkDelete: $scope.model.config.bulkActionPermissions.allowBulkDelete
};
// Check if selected order by field is actually custom field
for (var j = 0; j < $scope.options.includeProperties.length; j++) {
var includedProperty = $scope.options.includeProperties[j];
if (includedProperty.alias.toLowerCase() === $scope.options.orderBy.toLowerCase()) {
$scope.options.orderBySystemField = includedProperty.isSystem === 1;
break;
}
}
//update all of the system includeProperties to enable sorting
_.each($scope.options.includeProperties, function (e, i) {
@@ -180,12 +188,12 @@ function listViewController($rootScope, $scope, $routeParams, $injector, $cookie
}
if (e.isSystem) {
//localize the header
var key = getLocalizedKey(e.alias);
localizationService.localize(key).then(function (v) {
e.header = v;
});
}
//localize the header
var key = getLocalizedKey(e.alias);
localizationService.localize(key).then(function (v) {
e.header = v;
});
}
});
$scope.selectLayout = function (selectedLayout) {

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

@@ -1,40 +1,95 @@
function sortByPreValsController($rootScope, $scope, localizationService) {
function sortByPreValsController($rootScope, $scope, localizationService, editorState, listViewPrevalueHelper) {
//Get the prevalue from the correct place
function getPrevalues() {
if (editorState.current.preValues) {
return editorState.current.preValues;
}
else {
return listViewPrevalueHelper.getPrevalues();
}
}
$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;
//Watch the prevalues
$scope.$watch(function () {
return _.findWhere(getPrevalues(), { key: "includeProperties" }).value;
}, function () {
populateFields();
}, true); //Use deep watching, otherwise we won't pick up header changes
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;
function populateFields() {
// Helper to find a particular value from the list of sort by options
function findFromSortByFields(value) {
return _.find($scope.sortByFields, function (e) {
return e.value.toLowerCase() === value.toLowerCase();
});
}
// Get list of properties assigned as columns of the list view
var propsPreValue = _.findWhere(getPrevalues(), { key: "includeProperties" });
// Populate list of options for the default sort (all the columns plus then node name)
$scope.sortByFields = [];
$scope.sortByFields.push({ value: "name", name: "Name", isSystem: 1 });
if (propsPreValue != undefined) {
for (var i = 0; i < propsPreValue.value.length; i++) {
var value = propsPreValue.value[i];
$scope.sortByFields.push({
value: value.alias,
name: value.header,
isSystem: value.isSystem
});
}
});
});
}
// Localize the system fields, for some reason the directive doesn't work inside of the select group with an ng-model declared
var systemFields = [
{ 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" }
];
_.each(systemFields, function (e) {
localizationService.localize(e.key).then(function (v) {
var sortByListValue = findFromSortByFields(e.value);
if (sortByListValue) {
sortByListValue.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;
}
}
});
});
// Check existing model value is available in list and ensure a value is set
var existingValue = findFromSortByFields($scope.model.value);
if (existingValue) {
// 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.value;
}
else {
// Existing value not found, set to first value
$scope.model.value = $scope.sortByFields[0].value;
}
}
}

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

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

15
src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs
View File

@@ -53,9 +53,17 @@ namespace Umbraco.Web.PropertyEditors
{
[PreValueField("displayAtTabNumber", "Display At Tab Number", "number", Description = "Which tab position that the list of child items will be displayed")]
public int DisplayAtTabNumber { get; set; }
[PreValueField("pageSize", "Page Size", "number", Description = "Number of items per page")]
public int PageSize { get; set; }
[PreValueField("layouts", "Layouts", "views/propertyeditors/listview/layouts.prevalues.html")]
public int Layouts { get; set; }
[PreValueField("includeProperties", "Columns Displayed", "views/propertyeditors/listview/includeproperties.prevalues.html",
Description = "The properties that will be displayed for each column")]
public object IncludeProperties { get; set; }
[PreValueField("orderBy", "Order By", "views/propertyeditors/listview/sortby.prevalues.html",
Description = "The default sort order for the list")]
public int OrderBy { get; set; }
@@ -63,15 +71,10 @@ namespace Umbraco.Web.PropertyEditors
[PreValueField("orderDirection", "Order Direction", "views/propertyeditors/listview/orderdirection.prevalues.html")]
public int OrderDirection { get; set; }
[PreValueField("layouts", "Layouts", "views/propertyeditors/listview/layouts.prevalues.html")]
public int Layouts { get; set; }
[PreValueField("includeProperties", "Columns Displayed", "views/propertyeditors/listview/includeproperties.prevalues.html",
Description = "The properties that will be displayed for each column")]
public object IncludeProperties { get; set; }
[PreValueField("bulkActionPermissions", "Bulk Action Permissions", "views/propertyeditors/listview/bulkactionpermissions.prevalues.html",
Description = "The bulk actions that are allowed from the list view")]
public BulkActionPermissionSettings BulkActionPermissions { get; set; }
internal class BulkActionPermissionSettings
{
public bool AllowBulkPublish { get; set; }