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

Show containers in folderbrowser again

Browse Source
This commit is contained in:
Sebastiaan Janssen
2013-06-02 05:03:51 -02:00
parent 242443d861
commit 79e0242468
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/Umbraco.Web/WebServices/FolderBrowserService.cs
View File

@@ -31,28 +31,28 @@ namespace Umbraco.Web.WebServices
var entities = service.GetChildren(parentId, UmbracoObjectTypes.Media);
foreach (UmbracoEntity entity in entities)
{
var properties = entity.UmbracoProperties.Where(x => x.DataTypeControlId == new Guid(Constants.PropertyEditors.UploadField)).ToList();
if(properties.Any() == false) continue;
var uploadFieldProperty = entity.UmbracoProperties.FirstOrDefault(x => x.DataTypeControlId == new Guid(Constants.PropertyEditors.UploadField));
foreach (var property in properties)
var thumbnailUrl = uploadFieldProperty == null ? "" : ThumbnailProvidersResolver.Current.GetThumbnailUrl(uploadFieldProperty.Value);
var item = new
{
var thumbUrl = ThumbnailProvidersResolver.Current.GetThumbnailUrl(property.Value);
var item = new
{
Id = entity.Id,
Path = entity.Path,
Name = entity.Name,
Tags = string.Join(",", Tag.GetTags(entity.Id).Select(x => x.TagCaption)),
MediaTypeAlias = entity.ContentTypeAlias,
EditUrl = string.Format("editMedia.aspx?id={0}", entity.Id),
FileUrl = property.Value,
ThumbnailUrl = string.IsNullOrEmpty(thumbUrl)
? IOHelper.ResolveUrl(string.Format("{0}/images/thumbnails/{1}", SystemDirectories.Umbraco, entity.ContentTypeThumbnail))
: thumbUrl
};
Id = entity.Id,
Path = entity.Path,
Name = entity.Name,
Tags = string.Join(",", Tag.GetTags(entity.Id).Select(x => x.TagCaption)),
MediaTypeAlias = entity.ContentTypeAlias,
EditUrl = string.Format("editMedia.aspx?id={0}", entity.Id),
FileUrl = uploadFieldProperty == null
? ""
: uploadFieldProperty.Value,
ThumbnailUrl = string.IsNullOrEmpty(thumbnailUrl)
? IOHelper.ResolveUrl(string.Format("{0}/images/thumbnails/{1}", SystemDirectories.Umbraco, entity.ContentTypeThumbnail))
: thumbnailUrl
};
data.Add(item);
data.Add(item);
}
}
return new JavaScriptSerializer().Serialize(data);