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

Fixes: U4-5691 Search in backoffice pickers not working

Browse Source
This commit is contained in:
Shannon
2014-10-28 09:28:53 +10:00
parent 870b611871
commit b6d0b46332
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Umbraco.Web/Editors/EntityController.cs
View File

@@ -305,20 +305,33 @@ namespace Umbraco.Web.Editors
break;
case UmbracoEntityTypes.Media:
type = "media";
if (Security.CurrentUser.StartMediaId > 0 || searchFrom != null)
var mediaSearchFrom = int.MinValue;
if (Security.CurrentUser.StartMediaId > 0 ||
//if searchFrom is specified and it is greater than 0
(searchFrom != null && int.TryParse(searchFrom, out mediaSearchFrom) && mediaSearchFrom > 0))
{
sb.Append("+__Path: \\-1*\\,");
sb.Append((searchFrom ?? Security.CurrentUser.StartMediaId.ToString(CultureInfo.InvariantCulture)));
sb.Append(mediaSearchFrom > 0
? mediaSearchFrom.ToString(CultureInfo.InvariantCulture)
: Security.CurrentUser.StartMediaId.ToString(CultureInfo.InvariantCulture));
sb.Append("\\,* ");
}
break;
case UmbracoEntityTypes.Document:
type = "content";
if (Security.CurrentUser.StartMediaId > 0 || searchFrom != null)
var contentSearchFrom = int.MinValue;
if (Security.CurrentUser.StartContentId > 0 ||
//if searchFrom is specified and it is greater than 0
(searchFrom != null && int.TryParse(searchFrom, out contentSearchFrom) && contentSearchFrom > 0))
{
sb.Append("+__Path: \\-1*\\,");
sb.Append((searchFrom ?? Security.CurrentUser.StartContentId.ToString(CultureInfo.InvariantCulture)));
sb.Append(contentSearchFrom > 0
? contentSearchFrom.ToString(CultureInfo.InvariantCulture)
: Security.CurrentUser.StartContentId.ToString(CultureInfo.InvariantCulture));
sb.Append("\\,* ");
}
break;