lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-14 19:04:51 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : dev
This commit is contained in:
Nathan Heskew
2010-12-10 16:09:25 -08:00
parent b6ff06eb1d ae6d186341
commit d219f38af7
5 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Orchard.Web/Modules/Orchard.Packaging/Controllers/GalleryController.cs
View File

@@ -1,5 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data.Services.Client;
using System.Linq; using System.Linq;
using System.Web.Hosting; using System.Web.Hosting;
using System.Web.Mvc; using System.Web.Mvc;

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

@@ -1,4 +1,3 @@
using System; using System;
using Orchard.Packaging.Models; using Orchard.Packaging.Models;
@@ -9,6 +8,7 @@ namespace Orchard.Packaging.Services {
public string PackageId { get; set; } public string PackageId { get; set; }
public string Version { get; set; } public string Version { get; set; }
public string PackageStreamUri { get; set; } public string PackageStreamUri { get; set; }
public string ProjectUrl { get; set; }
public DateTime LastUpdated { get; set; } public DateTime LastUpdated { get; set; }
public string Authors { get; set; } public string Authors { get; set; }
public string Description { get; set; } public string Description { get; set; }

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

@@ -52,19 +52,22 @@ namespace Orchard.Packaging.Services {
private IEnumerable<PackagingEntry> GetExtensionList(string filter = null, PackagingSource packagingSource = null) { private IEnumerable<PackagingEntry> GetExtensionList(string filter = null, PackagingSource packagingSource = null) {
return (packagingSource == null ? GetSources() : new[] {packagingSource}) return (packagingSource == null ? GetSources() : new[] {packagingSource})
.SelectMany( .SelectMany(
source => source => {
new GalleryFeedContext(new Uri(source.FeedUrl)).Packages GalleryFeedContext galleryFeedContext = new GalleryFeedContext(new Uri(source.FeedUrl));
.Where(p => p.PackageType == filter) return galleryFeedContext.Packages
.ToList() .Where(p => p.PackageType == filter)
.Select(p => CreatePackageEntry(p, packagingSource)) .ToList()
.Select(p => CreatePackageEntry(p, packagingSource, galleryFeedContext.GetReadStreamUri(p)));
}
).ToArray(); ).ToArray();
} }
private static PackagingEntry CreatePackageEntry(PublishedPackage package, PackagingSource source) { private static PackagingEntry CreatePackageEntry(PublishedPackage package, PackagingSource source, Uri downloadUri) {
return new PackagingEntry { return new PackagingEntry {
Title = String.IsNullOrWhiteSpace(package.Title) ? package.Id : package.Title, Title = String.IsNullOrWhiteSpace(package.Title) ? package.Id : package.Title,
PackageId = package.Id, PackageId = package.Id,
PackageStreamUri = package.ProjectUrl != null ? package.ProjectUrl.ToString() : String.Empty, PackageStreamUri = downloadUri.ToString(),
ProjectUrl = package.ProjectUrl,
Source = source, Source = source,
Version = package.Version ?? String.Empty, Version = package.Version ?? String.Empty,
Description = package.Description, Description = package.Description,

1
src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Modules.cshtml
View File

@@ -36,6 +36,7 @@
<ul class="pageStatus"> <ul class="pageStatus">
<li>@T("Last Updated: {0}", DateTime.Now.ToLocalTime())</li> <li>@T("Last Updated: {0}", DateTime.Now.ToLocalTime())</li>
<li>&nbsp;&#124;&nbsp;@T("Author: {0}", item.Authors)</li> <li>&nbsp;&#124;&nbsp;@T("Author: {0}", item.Authors)</li>
<li>&nbsp;&#124;&nbsp;@T("Project Url: ")<a href="@item.ProjectUrl">@item.ProjectUrl</a></li>
</ul> </ul>
</div> </div>
</li>} </li>}

1
src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Themes.cshtml
View File

@@ -36,6 +36,7 @@
<ul class="pageStatus"> <ul class="pageStatus">
<li>@T("Last Updated: {0}", DateTime.Now.ToLocalTime())</li> <li>@T("Last Updated: {0}", DateTime.Now.ToLocalTime())</li>
<li>&nbsp;&#124;&nbsp;@T("Author: {0}", item.Authors)</li> <li>&nbsp;&#124;&nbsp;@T("Author: {0}", item.Authors)</li>
<li>&nbsp;&#124;&nbsp;@T("Project Url: ")<a href="@item.ProjectUrl">@item.ProjectUrl</a></li>
</ul> </ul>
</div> </div>
</li>} </li>}