lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-11-28 09:22:55 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

#17553: Fixing issue on the extension reference repository that was generating an HTTP request per package on the gallery during installation.

Browse Source 
Adding a null check on the package source manager in case there is absolutely no screenshot defined.

--HG--
branch : 1.x
This commit is contained in:
Andre Rodrigues
2011-04-07 17:06:18 -07:00
parent d2bc28df48
commit 3ce43e1eb2
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Orchard.Web/Modules/Orchard.Packaging/Services/ExtensionReferenceRepository.cs
View File

@@ -38,20 +38,19 @@ namespace Orchard.Packaging.Services {
}
public override IQueryable<IPackage> GetPackages() {
IEnumerable<IPackage> repositoryPackages = SourceRepository.GetPackages().ToList();
IEnumerable<IPackage> packages = from extension in _extensionManager.AvailableExtensions()
let id = PackageBuilder.BuildPackageId(extension.Id, extension.ExtensionType)
let version = Version.Parse(extension.Version)
let package = SourceRepository.FindPackage(id, version)
let package = repositoryPackages.FirstOrDefault(p => p.Id == id && p.Version == version)
where package != null
select package;
return packages.AsQueryable();
}
public override void AddPackage(IPackage package) {
}
public override void AddPackage(IPackage package) {}
public override void RemovePackage(IPackage package) {
}
public override void RemovePackage(IPackage package) {}
}
}

2
src/Orchard.Web/Modules/Orchard.Packaging/Services/PackagingSourceManager.cs
View File

@@ -115,7 +115,7 @@ namespace Orchard.Packaging.Services {
downloadUri.Host,
downloadUri.Port));
PublishedScreenshot screenshot = package.Screenshots.FirstOrDefault();
PublishedScreenshot screenshot = package.Screenshots != null ? package.Screenshots.FirstOrDefault() : null;
string iconUrl = GetAbsoluteUri(package.IconUrl, baseUri);
string firstScreenshot = screenshot != null ? GetAbsoluteUri(screenshot.ScreenshotUri, baseUri) : string.Empty;