lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : dev
This commit is contained in:
Renaud Paquay
2010-07-23 16:46:19 -07:00
parent a59a712e98 a2e4618986
commit c1707a46ad
25 changed files with 222 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Orchard.Web/Core/Common/DataMigrations/CommonDataMigration.cs
View File

@@ -4,6 +4,7 @@ using Orchard.ContentManagement.Drivers;
using Orchard.ContentManagement.MetaData;
using Orchard.ContentManagement.MetaData.Builders;
using Orchard.Core.Common.Models;
using Orchard.Core.Contents.Extensions;
using Orchard.Data.Migration;
namespace Orchard.Core.Common.DataMigrations {
@@ -53,5 +54,11 @@ namespace Orchard.Core.Common.DataMigrations {
}));
return 3;
}
public int UpdateFrom3() {
ContentDefinitionManager.AlterPartDefinition("BodyPart", builder => builder.Attachable());
ContentDefinitionManager.AlterPartDefinition("CommonPart", builder => builder.Attachable());
return 4;
}
}
}

4
src/Orchard.Web/Core/Contents/Extensions/MetaDataExtensions.cs
View File

@@ -2,8 +2,12 @@
namespace Orchard.Core.Contents.Extensions {
public static class MetaDataExtensions {
//todo: revisit "creatable" and "attachable", other words by be more fitting
public static ContentTypeDefinitionBuilder Creatable(this ContentTypeDefinitionBuilder builder, bool creatable = true) {
return builder.WithSetting("ContentTypeSettings.Creatable", creatable.ToString());
}
public static ContentPartDefinitionBuilder Attachable(this ContentPartDefinitionBuilder builder, bool creatable = true) {
return builder.WithSetting("ContentPartSettings.Attachable", creatable.ToString());
}
}
}

8
src/Orchard.Web/Core/Contents/Settings/ContentPartSettings.cs Normal file
View File

@@ -0,0 +1,8 @@
namespace Orchard.Core.Contents.Settings {
public class ContentPartSettings {
/// <summary>
/// This setting is used to display a Content Part in list of Parts to attach to a Content Type
/// </summary>
public bool Attachable { get; set; }
}
}

6
src/Orchard.Web/Core/Localization/DataMigrations/LocalizationDataMigration.cs
View File

@@ -2,6 +2,7 @@
using Orchard.ContentManagement.Drivers;
using Orchard.ContentManagement.MetaData;
using Orchard.ContentManagement.MetaData.Builders;
using Orchard.Core.Contents.Extensions;
using Orchard.Core.Localization.Models;
using Orchard.Data.Migration;
@@ -26,5 +27,10 @@ namespace Orchard.Core.Localization.DataMigrations {
}));
return 2;
}
public int UpdateFrom2() {
ContentDefinitionManager.AlterPartDefinition("LocalizationPart", builder => builder.Attachable());
return 3;
}
}
}

6
src/Orchard.Web/Core/Navigation/DataMigrations/NavigationDataMigration.cs
View File

@@ -2,6 +2,7 @@
using Orchard.ContentManagement.Drivers;
using Orchard.ContentManagement.MetaData;
using Orchard.ContentManagement.MetaData.Builders;
using Orchard.Core.Contents.Extensions;
using Orchard.Core.Navigation.Models;
using Orchard.Data.Migration;
@@ -42,5 +43,10 @@ namespace Orchard.Core.Navigation.DataMigrations {
}));
return 3;
}
public int UpdateFrom3() {
ContentDefinitionManager.AlterPartDefinition("MenuPart", builder => builder.Attachable());
return 4;
}
}
}

1
src/Orchard.Web/Core/Orchard.Core.csproj
View File

@@ -86,6 +86,7 @@
<Compile Include="Contents\Permissions.cs" />
<Compile Include="Contents\Routes.cs" />
<Compile Include="Contents\Settings\ContentTypeSettings.cs" />
<Compile Include="Contents\Settings\ContentPartSettings.cs" />
<Compile Include="Contents\ViewModels\PublishContentViewModel.cs" />
<Compile Include="Localization\ViewModels\EditLocalizationViewModel.cs" />
<Compile Include="PublishLater\DataMigrations\PublishLaterDataMigration.cs" />

6
src/Orchard.Web/Core/Routable/DataMigrations/RoutableDataMigration.cs
View File

@@ -2,6 +2,7 @@
using Orchard.ContentManagement.Drivers;
using Orchard.ContentManagement.MetaData;
using Orchard.ContentManagement.MetaData.Builders;
using Orchard.Core.Contents.Extensions;
using Orchard.Core.Routable.Models;
using Orchard.Data.Migration;
@@ -28,5 +29,10 @@ namespace Orchard.Core.Routable.DataMigrations {
return 2;
}
public int UpdateFrom2() {
ContentDefinitionManager.AlterPartDefinition("RoutePart", builder => builder.Attachable());
return 3;
}
}
}

6
src/Orchard.Web/Modules/Orchard.Comments/DataMigrations/CommentsDataMigration.cs
View File

@@ -4,6 +4,7 @@ using Orchard.Comments.Models;
using Orchard.ContentManagement.Drivers;
using Orchard.ContentManagement.MetaData;
using Orchard.ContentManagement.MetaData.Builders;
using Orchard.Core.Contents.Extensions;
using Orchard.Data.Migration;
namespace Orchard.Comments.DataMigrations {
@@ -82,5 +83,10 @@ namespace Orchard.Comments.DataMigrations {
return 3;
}
public int UpdateFrom3() {
ContentDefinitionManager.AlterPartDefinition("CommentsPart", builder => builder.Attachable());
return 4;
}
}
}

3
src/Orchard.Web/Modules/Orchard.ContentTypes/Controllers/AdminController.cs
View File

@@ -5,6 +5,7 @@ using Orchard.ContentManagement;
using Orchard.ContentManagement.MetaData.Models;
using Orchard.ContentTypes.Services;
using Orchard.ContentTypes.ViewModels;
using Orchard.Core.Contents.Settings;
using Orchard.Localization;
using Orchard.Mvc.Results;
using Orchard.UI.Notify;
@@ -113,7 +114,7 @@ namespace Orchard.ContentTypes.Controllers {
var viewModel = new AddPartsViewModel {
Type = typeViewModel,
PartSelections = _contentDefinitionService.GetParts()
.Where(cpd => !typeViewModel.Parts.Any(p => p.PartDefinition.Name == cpd.Name))
.Where(cpd => !typeViewModel.Parts.Any(p => p.PartDefinition.Name == cpd.Name) && cpd.Settings.GetModel<ContentPartSettings>().Attachable)
.Select(cpd => new PartSelectionViewModel { PartName = cpd.Name, PartDisplayName = cpd.DisplayName })
};

6
src/Orchard.Web/Modules/Orchard.ContentTypes/Services/ContentDefinitionService.cs
View File

@@ -149,11 +149,11 @@ namespace Orchard.ContentTypes.Services {
public IEnumerable<EditPartViewModel> GetParts() {
var typeNames = GetTypes().Select(ctd => ctd.Name);
// user-defined parts
var contentParts = _contentDefinitionManager.ListPartDefinitions().Select(cpd => new EditPartViewModel(cpd));
// code-defined parts
var codeDefinedParts = _contentPartDrivers
.SelectMany(d => d.GetPartInfo().Select(cpi => new EditPartViewModel { Name = cpi.PartName }));
// user-defined parts
var contentParts = _contentDefinitionManager.ListPartDefinitions().Where(cpd => !codeDefinedParts.Any(m => m.Name == cpd.Name)).Select(cpd => new EditPartViewModel(cpd));
.SelectMany(d => d.GetPartInfo().Where(cpd => !contentParts.Any(m => m.Name == cpd.PartName)).Select(cpi => new EditPartViewModel { Name = cpi.PartName }));
// all together now, except for those parts with the same name as a type (implicit type's part or a mistake)
return contentParts.Where(m => !typeNames.Contains(m.Name)).Union(codeDefinedParts).OrderBy(m => m.Name);
}

2
src/Orchard.Web/Modules/Orchard.Packaging/AdminMenu.cs
View File

@@ -13,7 +13,7 @@ namespace Orchard.Packaging {
builder.Add(T("Gallery"), "5", menu => menu
.Add(T("Browse Gallery"), "1.0", item => item
.Action("Index", "Gallery", new { area = "Orchard.Packaging" }))
.Add(T("Manage Feeds"), "2.0", item => item
.Add(T("Gallery Feeds"), "2.0", item => item
.Action("Sources", "Gallery", new { area = "Orchard.Packaging" })));
}
}

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

@@ -33,7 +33,7 @@ namespace Orchard.Packaging.Controllers {
Localizer T { get; set; }
public ActionResult Index() {
return Modules();
return Modules(Guid.Empty);
}
public ActionResult Sources() {
@@ -42,16 +42,59 @@ namespace Orchard.Packaging.Controllers {
});
}
public ActionResult AddSource(string url) {
_packagingSourceManager.AddSource(new PackagingSource { Id = Guid.NewGuid(), FeedUrl = url });
public ActionResult Remove(Guid id) {
_packagingSourceManager.RemoveSource(id);
_notifier.Information(T("The feed has been removed successfully."));
Update();
return RedirectToAction("Sources");
}
public ActionResult AddSource() {
return View(new PackagingAddSourceViewModel());
}
public ActionResult AddSourceViewResult(PackagingAddSourceViewModel model) {
return View("AddSource", model);
}
[HttpPost]
public ActionResult AddSource(string title, string url) {
try {
if ( !String.IsNullOrEmpty(url) ) {
if (!url.StartsWith("http")) {
ModelState.AddModelError("Url", T("The Url is a valid").Text);
}
}
else if ( String.IsNullOrWhiteSpace(url)) {
ModelState.AddModelError("Url", T("Url is required").Text);
}
if ( String.IsNullOrWhiteSpace(title) ) {
ModelState.AddModelError("Url", T("Title is required").Text);
}
if ( !ModelState.IsValid )
return AddSourceViewResult(new PackagingAddSourceViewModel(){Title = title, Url = url});
_packagingSourceManager.AddSource(new PackagingSource { Id = Guid.NewGuid(), FeedUrl = url, FeedTitle = title });
_notifier.Information(T("The feed has been added successfully."));
Update();
return RedirectToAction("Sources");
}
catch ( Exception exception ) {
_notifier.Error(T("Adding feed failed: {0}", exception.Message));
return AddSourceViewResult(new PackagingAddSourceViewModel() { Title = title, Url = url });
}
}
public ActionResult Modules(Guid? sourceId) {
var selectedSource = _packagingSourceManager.GetSources().Where(s => s.Id == sourceId).FirstOrDefault();
public ActionResult Modules() {
return View("Modules", new PackagingModulesViewModel {
Modules = _packagingSourceManager.GetModuleList()
Modules = _packagingSourceManager.GetModuleList(selectedSource),
Sources = _packagingSourceManager.GetSources().OrderBy(s => s.FeedTitle),
SelectedSource = selectedSource
});
}

2
src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj
View File

@@ -86,6 +86,7 @@
<Compile Include="Services\PackagingEntry.cs" />
<Compile Include="Services\PackagingSource.cs" />
<Compile Include="Services\PackagingSourceManager.cs" />
<Compile Include="ViewModels\PackagingAddSourceViewModel.cs" />
<Compile Include="ViewModels\PackagingHarvestViewModel.cs" />
<Compile Include="ViewModels\PackagingModulesViewModel.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
@@ -93,6 +94,7 @@
</ItemGroup>
<ItemGroup>
<Content Include="Module.txt" />
<Content Include="Views\Gallery\AddSource.ascx" />
<Content Include="Views\Gallery\Harvest.ascx" />
<Content Include="Views\Gallery\Modules.ascx" />
<Content Include="Views\Gallery\Sources.ascx" />

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

@@ -8,6 +8,6 @@ namespace Orchard.Packaging.Services {
void RemoveSource(Guid id);
void UpdateLists();
IEnumerable<PackagingEntry> GetModuleList();
IEnumerable<PackagingEntry> GetModuleList(PackagingSource packagingSource = null);
}
}

1
src/Orchard.Web/Modules/Orchard.Packaging/Services/PackagingSource.cs
View File

@@ -3,6 +3,7 @@ using System;
namespace Orchard.Packaging.Services {
public class PackagingSource {
public Guid Id { get; set; }
public string FeedTitle { get; set; }
public string FeedUrl { get; set; }
}
}

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

@@ -46,8 +46,8 @@ namespace Orchard.Packaging.Services {
}
}
public IEnumerable<PackagingEntry> GetModuleList() {
IEnumerable<PackagingEntry> packageInfos = GetSources()
public IEnumerable<PackagingEntry> GetModuleList(PackagingSource packagingSource = null) {
IEnumerable<PackagingEntry> packageInfos = ( packagingSource == null ? GetSources() : new [] { packagingSource })
.SelectMany(
source =>
Bind(ParseFeed(_appDataFolder.ReadFile(GetFeedCachePath(source))),

12
src/Orchard.Web/Modules/Orchard.Packaging/ViewModels/PackagingAddSourceViewModel.cs Normal file
View File

@@ -0,0 +1,12 @@
using System.ComponentModel.DataAnnotations;
namespace Orchard.Packaging.ViewModels {
public class PackagingAddSourceViewModel {
[Required]
public string Url { get; set; }
[Required]
public string Title { get; set; }
}
}

2
src/Orchard.Web/Modules/Orchard.Packaging/ViewModels/PackagingModulesViewModel.cs
View File

@@ -4,5 +4,7 @@ using Orchard.Packaging.Services;
namespace Orchard.Packaging.ViewModels {
public class PackagingModulesViewModel {
public IEnumerable<PackagingEntry> Modules { get; set; }
public IEnumerable<PackagingSource> Sources { get; set; }
public PackagingSource SelectedSource { get; set; }
}
}

16
src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/AddSource.ascx Normal file
View File

@@ -0,0 +1,16 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Packaging.ViewModels.PackagingAddSourceViewModel>" %>
<h1>
<%: Html.TitleForPage(T("Add a Feed").ToString())%></h1>
<%using ( Html.BeginFormAntiForgeryPost(Url.Action("AddSource")) ) { %>
<%: Html.ValidationSummary() %>
<fieldset>
<label for="Title"><%: T("Feed Title") %></label>
<input id="Title" class="textMedium" name="Title" type="text" value="<%: Model.Title %>" />
<label for="Url"><%: T("Feed Url") %></label>
<input id="Url" class="textMedium" name="Url" type="text" value="<%: Model.Url %>"/>
</fieldset>
<fieldset>
<input type="submit" class="button primaryAction" value="<%: T("Add Feed") %>" />
</fieldset>
<% } %>

49
src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Modules.ascx
View File

@@ -2,13 +2,46 @@
<h1>
<%: Html.TitleForPage(T("Browse Gallery").ToString())%></h1>
<p><%:Html.ActionLink("Update List", "Update") %></p>
<div class="manage">
<%:Html.ActionLink("Update List", "Update", new object{}, new { @class = "button primaryAction" }) %>
</div>
<% using ( Html.BeginFormAntiForgeryPost(Url.Action("Modules", "Gallery")) ) {%>
<fieldset class="bulk-actions">
<label for="filterResults" class="bulk-filter"><%:T("Show only of feed")%></label>
<select id="sourceId" name="sourceId">
<%:Html.SelectOption("", Model.SelectedSource == null, T("Any (show all feeds)").ToString())%>
<%
foreach (var source in Model.Sources) {%>
<%:Html.SelectOption(source.Id, Model.SelectedSource != null && Model.SelectedSource.Id == source.Id, source.FeedTitle)%><%
}%>
</select>
<button type="submit"><%:T("Apply")%></button>
</fieldset>
<%
} %>
<ul>
<% if (Model.Modules.Count() > 0) { %>
<ul class="contentItems">
<%foreach (var item in Model.Modules) {%>
<li>
<a href="<%:item.PackageStreamUri%>"><%:item.SyndicationItem.Title.Text%></a>
[<%:Html.ActionLink("Install", "Install", new RouteValueDictionary {{"SyndicationId",item.SyndicationItem.Id}})%>]
</li>
<%}%>
</ul>
<li>
<ul class="summary">
<div class="properties">
<h2><%: item.SyndicationItem.Title.Text %><span> - <%: T("Version: {0}", "1.0")%></span></h2>
<p><%:item.SyndicationItem.Summary.Text %></p>
<ul class="pageStatus" style="color:#666; margin:.6em 0 0 0;">
<li><%: T("Last Updated: {0}", item.SyndicationItem.LastUpdatedTime.ToLocalTime()) %></li>
<li>&nbsp;&#124;&nbsp;<%: T("Author: {0}", item.SyndicationItem.Authors.Any() ? String.Join(", ", item.SyndicationItem.Authors.Select(a => a.Name)) : T("Unknown").Text)%></li>
</ul>
</div>
<div class="related">
<%:Html.ActionLink("Install", "Install", new RouteValueDictionary {{"SyndicationId",item.SyndicationItem.Id}})%><%:T(" | ") %>
<a href="<%:item.PackageStreamUri%>">Download</a>
</div>
</ul>
</li><%
}%>
</ul><%
}%>

44
src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Sources.ascx
View File

@@ -1,13 +1,39 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Packaging.ViewModels.PackagingSourcesViewModel>" %>
<h1>
<%: Html.TitleForPage(T("Manage Feeds").ToString())%></h1>
<%: Html.TitleForPage(T("Gallery Feeds").ToString())%></h1>
<ul>
<%foreach (var item in Model.Sources) {%><li>
<%:Html.Link(item.FeedUrl, item.FeedUrl)%></li>
<% }%>
</ul>
<div class="manage">
<%:Html.ActionLink(T("Add a Feed").Text, "AddSource", new { }, new { @class = "button primaryAction" }) %>
</div>
<%using (Html.BeginFormAntiForgeryPost(Url.Action("AddSource"))) {%>
Url: <%:Html.TextBox("url") %> <input type="submit" value="Add Source" />
<%} %>
<fieldset>
<table class="items" summary="<%: T("This is a table of the gallery feeds in your application") %>">
<colgroup>
<col id="Col1" />
<col id="Col2" />
<col id="Col3" />
</colgroup>
<thead>
<tr>
<th scope="col"><%: T("Title")%></th>
<th scope="col"><%: T("Url")%></th>
<th scope="col"></th>
</tr>
</thead>
<%
foreach ( var item in Model.Sources ) {
%>
<tr>
<td>
<%: item.FeedTitle %>
</td>
<td>
<%:Html.Link(item.FeedUrl, item.FeedUrl)%>
</td>
<td>
<%: Html.ActionLink(T("Remove").ToString(), "Remove", new { id = item.Id })%>
</td>
</tr>
<% } %>
</table>
</fieldset>

6
src/Orchard.Web/Modules/Orchard.Tags/DataMigrations/TagsDataMigration.cs
View File

@@ -2,6 +2,7 @@
using Orchard.ContentManagement.Drivers;
using Orchard.ContentManagement.MetaData;
using Orchard.ContentManagement.MetaData.Builders;
using Orchard.Core.Contents.Extensions;
using Orchard.Data.Migration;
using Orchard.Tags.Models;
@@ -32,5 +33,10 @@ namespace Orchard.Tags.DataMigrations {
}));
return 2;
}
public int UpdateFrom2() {
ContentDefinitionManager.AlterPartDefinition("TagsPart", builder => builder.Attachable());
return 3;
}
}
}

2
src/Orchard.Web/Themes/Contoso/Views/User.ascx
View File

@@ -8,6 +8,6 @@
<% }
else
{ %>
<li><%: Html.ActionLink(T("Login").ToString(), "LogOn", new { Controller = "Account", Area = "Orchard.Users", ReturnUrl = Context.Request.RawUrl })%></li>
<li><%: Html.ActionLink(T("Log On").ToString(), "LogOn", new { Controller = "Account", Area = "Orchard.Users", ReturnUrl = Context.Request.RawUrl })%></li>
<% } %>
</ul>

4
src/Tools/PackageIndexReferenceImplementation/PackageIndexReferenceImplementation.csproj
View File

@@ -90,7 +90,9 @@
</ItemGroup>
<ItemGroup>
<Content Include="Global.asax" />
<Content Include="Web.config" />
<Content Include="Web.config">
<SubType>Designer</SubType>
</Content>
<Content Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</Content>

2
src/Tools/PackageIndexReferenceImplementation/Web.config
View File

@@ -13,6 +13,8 @@
</connectionStrings>
<system.web>
<compilation debug="true" targetFramework="4.0">
<assemblies>
<add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />