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

fixes GetChildren non bool argument to work as a bool again.

Browse Source
This commit is contained in:
Shannon
2016-04-06 09:17:05 +02:00
parent 90a66aeebd
commit dac7b93209
2 changed files with 629 additions and 616 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1238
src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
View File

File diff suppressed because it is too large Load Diff

7
src/Umbraco.Web/Editors/ContentController.cs
View File

@@ -184,17 +184,16 @@ namespace Umbraco.Web.Editors
int pageSize = 0,
string orderBy = "SortOrder",
Direction orderDirection = Direction.Ascending,
int? orderBySystemField = 2,
bool orderBySystemField = true,
string filter = "")
{
var orderBySystemFieldBool = orderBySystemField == 1 || orderBySystemField == 2;
{
long totalChildren;
IContent[] children;
if (pageNumber > 0 && pageSize > 0)
{
children = Services.ContentService
.GetPagedChildren(id, (pageNumber - 1), pageSize, out totalChildren
, orderBy, orderDirection, orderBySystemFieldBool, filter).ToArray();
, orderBy, orderDirection, orderBySystemField, filter).ToArray();
}
else
{