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

Mini-list view search by id,name & key is fixed. (#13735)

Browse Source 
* Mini-list view search by id,name & key is fixed.
Added  multiple conditions in the query to consider id or name or key from the filter param(search bar from minilistview)

* make it more simple ,now using || instead of clause conditions.

---------

Co-authored-by: Dhanesh Kumar <dhanesh.kumar@phases.dk>
Co-authored-by: Michael <michael@crossingpaths.be>
This commit is contained in:
Dhanesh Kumar Mj
2023-02-06 17:27:36 +05:30
committed by GitHub
parent 371679b2e5
commit 2f5726384d
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Umbraco.Web.BackOffice/Controllers/EntityController.cs
View File

@@ -1,8 +1,11 @@
using System.Collections.Concurrent;
using System.Dynamic;
using System.Globalization;
using System.IO;
using System.Linq.Expressions;
using System.Reflection;
using System.Security.Cryptography;
using Examine.Search;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Infrastructure;
@@ -15,6 +18,7 @@ using Umbraco.Cms.Core.Models.Entities;
using Umbraco.Cms.Core.Models.Membership;
using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Cms.Core.Models.TemplateQuery;
using Umbraco.Cms.Core.Persistence;
using Umbraco.Cms.Core.Routing;
using Umbraco.Cms.Core.Security;
using Umbraco.Cms.Core.Services;
@@ -745,7 +749,11 @@ public class EntityController : UmbracoAuthorizedJsonController
{
return new PagedResult<EntityBasic>(0, 0, 0);
}
//adding multiple conditions ,considering id,key & name as filter param
//for id as int
int.TryParse(filter, out int filterAsIntId);
//for key as Guid
Guid.TryParse(filter, out Guid filterAsGuid);
// else proceed as usual
entities = _entityService.GetPagedChildren(
id,
@@ -755,7 +763,9 @@ public class EntityController : UmbracoAuthorizedJsonController
out long totalRecords,
filter.IsNullOrWhiteSpace()
? null
: _sqlContext.Query<IUmbracoEntity>().Where(x => x.Name!.Contains(filter)),
: _sqlContext.Query<IUmbracoEntity>().Where(x => x.Name!.Contains(filter)
|| x.Id == filterAsIntId
|| x.Key == filterAsGuid),
Ordering.By(orderBy, orderDirection));