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

Patched Contains query & implemented SortExpression

Browse Source
This commit is contained in:
Rusty Swayne
2014-06-09 09:14:26 -07:00
parent b0e96b256a
commit 0b3136cf20
1 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/Umbraco.Web/Editors/TemplateQuery/TemplateQueryController.cs
View File

@@ -53,7 +53,7 @@ namespace Umbraco.Web.Editors
{
new PropertyModel() { Name = "Id", Alias = "id", Type = "int" },
new PropertyModel() { Name = "Name", Alias = "name", Type = "string" },
new PropertyModel() { Name = "Url", Alias = "url", Type = "string" },
//new PropertyModel() { Name = "Url", Alias = "url", Type = "string" },
new PropertyModel() { Name = "Creation Date", Alias = "createDate", Type = "datetime" },
new PropertyModel() { Name = "Publishing Date", Alias = "publishDate", Type = "datetime" }
@@ -158,13 +158,13 @@ namespace Umbraco.Web.Editors
break;
case Operathor.Contains:
// .Where()
operation = string.Format("{0}.Contains(\"{1}\")", condition.Property.Name.ToLowerInvariant(), condition.ConstraintValue.ToLowerInvariant());
operation = string.Format("{0}.ToLowerInvariant().Contains(\"{1}\")", condition.Property.Name, condition.ConstraintValue.ToLowerInvariant());
break;
case Operathor.NotContains:
operation = string.Format("!{0}.Contains(\"{1}\")", condition.Property.Name.ToLowerInvariant(), condition.ConstraintValue.ToLowerInvariant());
operation = string.Format("!{0}.ToLowerInvariant().Contains(\"{1}\")", condition.Property.Name, condition.ConstraintValue.ToLowerInvariant());
break;
}
@@ -189,8 +189,8 @@ namespace Umbraco.Web.Editors
// TODO write extension to determine if built in property or not
contents = model.SortExpression.SortDirection == "ascending"
? contents.OrderBy(x => x.GetPropertyValue<string>(model.SortExpression.Property.Alias)).ToList()
: contents.OrderByDescending(x => x.GetPropertyValue<string>(model.SortExpression.Property.Alias)).ToList();
? contents.OrderBy(x => GetDefaultPropertyValue(x, model.SortExpression.Property)).ToList()
: contents.OrderByDescending(x => GetDefaultPropertyValue(x, model.SortExpression.Property)).ToList();
timer.Stop();
@@ -223,6 +223,24 @@ namespace Umbraco.Web.Editors
return queryResult;
}
private object GetDefaultPropertyValue(IPublishedContent content, PropertyModel prop)
{
switch (prop.Alias)
{
case "id" :
return content.Id;
case "createDate" :
return content.CreateDate;
case "publishDate":
return content.UpdateDate;
case "name":
return content.Name;
default :
return content.Name;
}
}
private IEnumerable<string> GetChildContentTypeAliases(IPublishedContent targetNode, IPublishedContent current)
{
var aliases = new List<string>();