lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-08-24 07:27:25 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : dev
This commit is contained in:
Louis DeJardin 2010-07-08 11:29:07 -07:00
commit f57a9ad2e3
41 changed files with 213 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Tests/DataMigration/SchemaBuilderTests.cs
View File

@ -51,7 +51,7 @@ namespace Orchard.Tests.DataMigration {
.Column("Firstname", DbType.String, column => column.WithLength(255)) .Column("Firstname", DbType.String, column => column.WithLength(255))
.Column("Lastname", DbType.String, column => column.WithPrecision(0).WithScale(1))) .Column("Lastname", DbType.String, column => column.WithPrecision(0).WithScale(1)))
.CreateTable("Address", table => table .CreateTable("Address", table => table
.VersionedContentPartRecord() .ContentPartVersionRecord()
.Column("City", DbType.String) .Column("City", DbType.String)
.Column("ZIP", DbType.Int32, column => column.Unique()) .Column("ZIP", DbType.Int32, column => column.Unique())
.Column("UserId", DbType.Int32, column => column.NotNull())) .Column("UserId", DbType.Int32, column => column.NotNull()))

4
src/Orchard.Tests/Environment/Extensions/ExtensionLoaderCoordinatorTests.cs
View File

@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
@ -68,7 +68,7 @@ namespace Orchard.Tests.Environment.Extensions {
throw new NotImplementedException(); throw new NotImplementedException();
} }
public bool IsCompatibleWithReferences(ExtensionDescriptor extension, IEnumerable<ExtensionProbeEntry> references) { public bool IsCompatibleWithModuleReferences(ExtensionDescriptor extension, IEnumerable<ExtensionProbeEntry> references) {
throw new NotImplementedException(); throw new NotImplementedException();
} }

4
src/Orchard.Tests/Environment/Extensions/ExtensionManagerTests.cs
View File

@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
@ -68,7 +68,7 @@ namespace Orchard.Tests.Environment.Extensions {
throw new NotImplementedException(); throw new NotImplementedException();
} }
public bool IsCompatibleWithReferences(ExtensionDescriptor extension, IEnumerable<ExtensionProbeEntry> references) { public bool IsCompatibleWithModuleReferences(ExtensionDescriptor extension, IEnumerable<ExtensionProbeEntry> references) {
throw new NotImplementedException(); throw new NotImplementedException();
} }

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

@ -7,15 +7,14 @@ namespace Orchard.Core.Common.DataMigrations {
public int Create() { public int Create() {
//CREATE TABLE Common_BodyRecord (Id INTEGER not null, Text TEXT, Format TEXT, ContentItemRecord_id INTEGER, primary key (Id)); //CREATE TABLE Common_BodyRecord (Id INTEGER not null, Text TEXT, Format TEXT, ContentItemRecord_id INTEGER, primary key (Id));
SchemaBuilder.CreateTable("BodyRecord", table => table SchemaBuilder.CreateTable("BodyRecord", table => table
.Column<int>("Id", column => column.PrimaryKey()) .ContentPartVersionRecord()
.Column<string>("Text") .Column<string>("Text")
.Column<string>("Format") .Column<string>("Format")
.Column<int>("ContentItemRecord_id")
); );
//CREATE TABLE Common_CommonRecord (Id INTEGER not null, OwnerId INTEGER, CreatedUtc DATETIME, PublishedUtc DATETIME, ModifiedUtc DATETIME, Container_id INTEGER, primary key (Id)); //CREATE TABLE Common_CommonRecord (Id INTEGER not null, OwnerId INTEGER, CreatedUtc DATETIME, PublishedUtc DATETIME, ModifiedUtc DATETIME, Container_id INTEGER, primary key (Id));
SchemaBuilder.CreateTable("CommonRecord", table => table SchemaBuilder.CreateTable("CommonRecord", table => table
.Column<int>("Id", column => column.PrimaryKey()) .ContentPartRecord()
.Column<int>("OwnerId") .Column<int>("OwnerId")
.Column<DateTime>("CreatedUtc") .Column<DateTime>("CreatedUtc")
.Column<DateTime>("PublishedUtc") .Column<DateTime>("PublishedUtc")
@ -25,20 +24,18 @@ namespace Orchard.Core.Common.DataMigrations {
//CREATE TABLE Common_CommonVersionRecord (Id INTEGER not null, CreatedUtc DATETIME, PublishedUtc DATETIME, ModifiedUtc DATETIME, ContentItemRecord_id INTEGER, primary key (Id)); //CREATE TABLE Common_CommonVersionRecord (Id INTEGER not null, CreatedUtc DATETIME, PublishedUtc DATETIME, ModifiedUtc DATETIME, ContentItemRecord_id INTEGER, primary key (Id));
SchemaBuilder.CreateTable("CommonVersionRecord", table => table SchemaBuilder.CreateTable("CommonVersionRecord", table => table
.Column<int>("Id", column => column.PrimaryKey()) .ContentPartVersionRecord()
.Column<DateTime>("CreatedUtc") .Column<DateTime>("CreatedUtc")
.Column<DateTime>("PublishedUtc") .Column<DateTime>("PublishedUtc")
.Column<DateTime>("ModifiedUtc") .Column<DateTime>("ModifiedUtc")
.Column<int>("ContentItemRecord_id")
); );
//CREATE TABLE Common_RoutableRecord (Id INTEGER not null, Title TEXT, Slug TEXT, Path TEXT, ContentItemRecord_id INTEGER, primary key (Id)); //CREATE TABLE Common_RoutableRecord (Id INTEGER not null, Title TEXT, Slug TEXT, Path TEXT, ContentItemRecord_id INTEGER, primary key (Id));
SchemaBuilder.CreateTable("RoutableRecord", table => table SchemaBuilder.CreateTable("RoutableRecord", table => table
.Column<int>("Id", column => column.PrimaryKey()) .ContentPartVersionRecord()
.Column<string>("Title") .Column<string>("Title")
.Column<string>("Slug") .Column<string>("Slug")
.Column<string>("Path") .Column<string>("Path")
.Column<int>("ContentItemRecord_id")
); );
return 0010; return 0010;

22
src/Orchard.Web/Core/Contents/AdminMenu.cs
View File

@ -18,18 +18,18 @@ namespace Orchard.Core.Contents {
public string MenuName { get { return "admin"; } } public string MenuName { get { return "admin"; } }
public void GetNavigation(NavigationBuilder builder) { public void GetNavigation(NavigationBuilder builder) {
//var contentTypeDefinitions = _contentDefinitionManager.ListTypeDefinitions().OrderBy(d => d.Name); var contentTypeDefinitions = _contentDefinitionManager.ListTypeDefinitions().OrderBy(d => d.Name);
//builder.Add(T("Content"), "1", menu => { builder.Add(T("Content"), "1", menu => {
// menu.Add(T("Manage Content"), "1.2", item => item.Action("List", "Admin", new {area = "Orchard.ContentTypes"})); menu.Add(T("Manage Content"), "1.2", item => item.Action("List", "Admin", new { area = "Contents" }));
//foreach (var contentTypeDefinition in contentTypeDefinitions) { foreach (var contentTypeDefinition in contentTypeDefinitions) {
// var ci = _contentManager.New(contentTypeDefinition.Name); var ci = _contentManager.New(contentTypeDefinition.Name);
// var cim = _contentManager.GetItemMetadata(ci); var cim = _contentManager.GetItemMetadata(ci);
// var createRouteValues = cim.CreateRouteValues; var createRouteValues = cim.CreateRouteValues;
// if (createRouteValues.Any()) if (createRouteValues.Any())
// menu.Add(T("Create New {0}", contentTypeDefinition.DisplayName), "1.3", item => item.Action(cim.CreateRouteValues["Action"] as string, cim.CreateRouteValues["Controller"] as string, cim.CreateRouteValues)); menu.Add(T("Create New {0}", contentTypeDefinition.DisplayName), "1.3", item => item.Action(cim.CreateRouteValues["Action"] as string, cim.CreateRouteValues["Controller"] as string, cim.CreateRouteValues));
//} }
//}); });
} }
} }
} }

25
src/Orchard.Web/Core/Contents/Controllers/AdminController.cs
View File

@ -48,10 +48,17 @@ namespace Orchard.Core.Contents.Controllers {
const int pageSize = 20; const int pageSize = 20;
var skip = (Math.Max(model.Page ?? 0, 1) - 1) * pageSize; var skip = (Math.Max(model.Page ?? 0, 1) - 1) * pageSize;
var query = _contentManager.Query(VersionOptions.Latest); var query = _contentManager.Query(VersionOptions.Latest, _contentDefinitionManager.ListTypeDefinitions().Select(ctd => ctd.Name).ToArray());
if (!string.IsNullOrEmpty(model.Id)) { if (!string.IsNullOrEmpty(model.TypeName)) {
query = query.ForType(model.Id); var contentTypeDefinition = _contentDefinitionManager.GetTypeDefinition(model.TypeName);
if (contentTypeDefinition == null)
return new NotFoundResult();
model.TypeDisplayName = !string.IsNullOrWhiteSpace(contentTypeDefinition.DisplayName)
? contentTypeDefinition.DisplayName
: contentTypeDefinition.Name;
query = query.ForType(model.TypeName);
} }
var contentItems = query.Slice(skip, pageSize); var contentItems = query.Slice(skip, pageSize);
@ -148,6 +155,18 @@ namespace Orchard.Core.Contents.Controllers {
return RedirectToAction("Edit", new RouteValueDictionary { { "Id", contentItem.Id } }); return RedirectToAction("Edit", new RouteValueDictionary { { "Id", contentItem.Id } });
} }
[HttpPost, ActionName("Remove")]
public ActionResult RemovePOST(int id, string returnUrl) {
var contentItem = _contentManager.Get(id);
if (contentItem != null)
_contentManager.Remove(contentItem);
if (!String.IsNullOrEmpty(returnUrl))
return Redirect(returnUrl);
return RedirectToAction("List");
}
private void PrepareEditorViewModel(ContentItemViewModel itemViewModel) { private void PrepareEditorViewModel(ContentItemViewModel itemViewModel) {
if (string.IsNullOrEmpty(itemViewModel.TemplateName)) { if (string.IsNullOrEmpty(itemViewModel.TemplateName)) {
itemViewModel.TemplateName = "Items/Contents.Item"; itemViewModel.TemplateName = "Items/Contents.Item";

5
src/Orchard.Web/Core/Contents/ViewModels/ListContentsViewModel.cs
View File

@ -1,11 +1,12 @@
using System; using System.Collections.Generic;
using System.Collections.Generic;
using Orchard.ContentManagement; using Orchard.ContentManagement;
using Orchard.Mvc.ViewModels; using Orchard.Mvc.ViewModels;
namespace Orchard.Core.Contents.ViewModels { namespace Orchard.Core.Contents.ViewModels {
public class ListContentsViewModel : BaseViewModel { public class ListContentsViewModel : BaseViewModel {
public string Id { get; set; } public string Id { get; set; }
public string TypeName { get { return Id; } }
public string TypeDisplayName { get; set; }
public int? Page { get; set; } public int? Page { get; set; }
public IList<Entry> Entries { get; set; } public IList<Entry> Entries { get; set; }

7
src/Orchard.Web/Core/Contents/Views/Admin/CreatableTypeList.ascx Normal file
View File

@ -0,0 +1,7 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ListContentTypesViewModel>" %>
<%@ Import Namespace="Orchard.Core.Contents.ViewModels" %>
<h1><%:Html.TitleForPage(T("Create New Content").ToString())%></h1>
<%:Html.UnorderedList(
Model.Types,
(ctd, i) => MvcHtmlString.Create(string.Format("<p>{0}</p>", Html.ActionLink(ctd.Name, "Create", new { Area = "Contents", Id = ctd.Name }))),
"contentTypes")%>

11
src/Orchard.Web/Core/Contents/Views/Admin/CreatableTypeList.aspx
View File

@ -1,11 +0,0 @@
<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<ListContentTypesViewModel>" %>
<%@ Import Namespace="Orchard.Core.Contents.ViewModels" %>
<% Html.AddTitleParts(T("Create Content").ToString()); %>
<p>
Create content</p>
<ul>
<% foreach (var t in Model.Types) {%>
<li>
<%:Html.ActionLink(t.Name, "Create", new RouteValueDictionary{{"Area","Contents"},{"Id",t.Name}}) %></li>
<%} %>
</ul>

37
src/Orchard.Web/Core/Contents/Views/Admin/List.ascx Normal file
View File

@ -0,0 +1,37 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Core.Contents.ViewModels.ListContentsViewModel>" %>
<%@ Import Namespace="Orchard.ContentManagement.Aspects"%>
<%@ Import Namespace="Orchard.ContentManagement"%>
<%@ Import Namespace="Orchard.Utility.Extensions" %>
<h1><%:Html.TitleForPage(T("Manage {0} Content", !string.IsNullOrEmpty(Model.TypeDisplayName) ? Model.TypeDisplayName : T("all").Text).ToString())%></h1>
<div class="manage">
<%:Html.ActionLink(!string.IsNullOrEmpty(Model.TypeDisplayName) ? T("Add new {0} content", Model.TypeDisplayName).Text : T("Add new content").Text, "Create", new { }, new { @class = "button primaryAction" })%>
</div>
<ul class="contentItems"><%
foreach (var entry in Model.Entries) { %>
<li>
<div class="summary">
<div class="properties">
<h3><%:entry.ContentItem.Is<IRoutableAspect>()
? Html.ActionLink(entry.ContentItem.As<IRoutableAspect>().Title, "Edit", new { id = entry.ContentItem.Id })
: MvcHtmlString.Create(string.Format("[title display template needed] (content type == \"{0}\")", entry.ContentItem.TypeDefinition.Name)) %></h3>
<ul class="pageStatus">
<li>
<%:T("Last modified: {0}",
entry.ContentItem.Is<ICommonAspect>() && entry.ContentItem.As<ICommonAspect>().ModifiedUtc.HasValue
? Html.DateTimeRelative(entry.ContentItem.As<ICommonAspect>().ModifiedUtc.Value, T)
: T("unknown"))%>
</li>
</ul>
</div>
<div class="related">
<%:Html.ActionLink(T("Edit").ToString(), "Edit", new { id = entry.ContentItem.Id }, new { title = T("Edit").ToString() })%><%: T(" | ")%>
<% using (Html.BeginFormAntiForgeryPost(Url.Action("Remove", new { id = entry.ContentItem.Id }), FormMethod.Post, new { @class = "inline link" })) { %>
<button type="submit" class="linkButton" title="<%: T("Remove") %>"><%: T("Remove") %></button>
<%:Html.Hidden("returnUrl", ViewContext.RequestContext.HttpContext.Request.ToUrlString())%><%
} %>
</div>
<div style="clear:both;"></div>
</div>
</li><%
} %>
</ul>

32
src/Orchard.Web/Core/Contents/Views/Admin/List.aspx
View File

@ -1,32 +0,0 @@
<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<ListContentsViewModel>" %>
<%@ Import Namespace="Orchard.Core.Contents.ViewModels" %>
<% Html.AddTitleParts(T("Browse Contents").ToString()); %>
<p>
Browse Contents</p>
<table>
<% foreach (var t in Model.Entries) {%>
<tr>
<td>
<%:t.ContentItem.Id %>.
</td>
<td>
<%:t.ContentItem.ContentType %>
</td>
<td>
ver #<%:t.ContentItem.Version %>
</td>
<td>
<%if (t.ContentItemMetadata.DisplayRouteValues != null) {%>
<%:Html.ActionLink(t.ContentItemMetadata.DisplayText, t.ContentItemMetadata.DisplayRouteValues["Action"].ToString(), t.ContentItemMetadata.DisplayRouteValues)%>
<%}%>
</td>
<td>
<%if (t.ContentItemMetadata.EditorRouteValues != null) {%>
<%:Html.ActionLink("edit", t.ContentItemMetadata.EditorRouteValues["Action"].ToString(), t.ContentItemMetadata.EditorRouteValues)%>
<%}%>
</td>
</tr>
<%} %>
</table>
<p>
<%:Html.ActionLink("Create new item", "Create", "Admin", new RouteValueDictionary{{"Area","Contents"},{"Id",Model.Id}}, new Dictionary<string, object>()) %></p>

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

@ -6,7 +6,7 @@ namespace Orchard.Core.Localization.DataMigrations {
public int Create() { public int Create() {
//CREATE TABLE Localization_LocalizedRecord (Id INTEGER not null, CultureId INTEGER, MasterContentItemId INTEGER, primary key (Id)); //CREATE TABLE Localization_LocalizedRecord (Id INTEGER not null, CultureId INTEGER, MasterContentItemId INTEGER, primary key (Id));
SchemaBuilder.CreateTable("LocalizedRecord", table => table SchemaBuilder.CreateTable("LocalizedRecord", table => table
.Column<int>("Id", column => column.PrimaryKey()) .ContentPartRecord()
.Column<int>("CultureId") .Column<int>("CultureId")
.Column<int>("MasterContentItemId") .Column<int>("MasterContentItemId")
); );

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

@ -6,13 +6,13 @@ namespace Orchard.Core.Navigation.DataMigrations {
public int Create() { public int Create() {
//CREATE TABLE Navigation_MenuItemRecord (Id INTEGER not null, Url TEXT, primary key (Id)); //CREATE TABLE Navigation_MenuItemRecord (Id INTEGER not null, Url TEXT, primary key (Id));
SchemaBuilder.CreateTable("MenuItemRecord", table => table SchemaBuilder.CreateTable("MenuItemRecord", table => table
.Column<int>("Id", column => column.PrimaryKey()) .ContentPartRecord()
.Column<string>("Url") .Column<string>("Url")
); );
//CREATE TABLE Navigation_MenuPartRecord (Id INTEGER not null, MenuText TEXT, MenuPosition TEXT, OnMainMenu INTEGER, primary key (Id)); //CREATE TABLE Navigation_MenuPartRecord (Id INTEGER not null, MenuText TEXT, MenuPosition TEXT, OnMainMenu INTEGER, primary key (Id));
SchemaBuilder.CreateTable("MenuPartRecord", table => table SchemaBuilder.CreateTable("MenuPartRecord", table => table
.Column<int>("Id", column => column.PrimaryKey()) .ContentPartRecord()
.Column<string>("MenuText") .Column<string>("MenuText")
.Column<string>("MenuPosition") .Column<string>("MenuPosition")
.Column<bool>("OnMainMenu") .Column<bool>("OnMainMenu")

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

@ -210,10 +210,10 @@
<Content Include="Common\Views\EditorTemplates\Parts\Common.Container.ascx" /> <Content Include="Common\Views\EditorTemplates\Parts\Common.Container.ascx" />
<Content Include="Common\Views\EditorTemplates\PlainTextEditor.ascx" /> <Content Include="Common\Views\EditorTemplates\PlainTextEditor.ascx" />
<Content Include="Contents\Module.txt" /> <Content Include="Contents\Module.txt" />
<Content Include="Contents\Views\Admin\List.aspx" />
<Content Include="Contents\Views\Admin\Edit.aspx" /> <Content Include="Contents\Views\Admin\Edit.aspx" />
<Content Include="Contents\Views\Admin\CreatableTypeList.aspx" /> <Content Include="Contents\Views\Admin\CreatableTypeList.ascx" />
<Content Include="Contents\Views\Admin\Create.aspx" /> <Content Include="Contents\Views\Admin\Create.aspx" />
<Content Include="Contents\Views\Admin\List.ascx" />
<Content Include="Contents\Views\DisplayTemplates\Items\Contents.Item.ascx" /> <Content Include="Contents\Views\DisplayTemplates\Items\Contents.Item.ascx" />
<Content Include="Contents\Views\EditorTemplates\Items\Contents.Item.ascx" /> <Content Include="Contents\Views\EditorTemplates\Items\Contents.Item.ascx" />
<Content Include="Contents\Views\Item\Preview.aspx" /> <Content Include="Contents\Views\Item\Preview.aspx" />

2
src/Orchard.Web/Core/Settings/DataMigrations/SettingsDataMigration.cs
View File

@ -82,7 +82,7 @@ namespace Orchard.Core.Settings.DataMigrations {
//CREATE TABLE Settings_SiteSettingsRecord (Id INTEGER not null, SiteSalt TEXT, SiteName TEXT, SuperUser TEXT, PageTitleSeparator TEXT, HomePage TEXT, SiteCulture TEXT, primary key (Id)); //CREATE TABLE Settings_SiteSettingsRecord (Id INTEGER not null, SiteSalt TEXT, SiteName TEXT, SuperUser TEXT, PageTitleSeparator TEXT, HomePage TEXT, SiteCulture TEXT, primary key (Id));
SchemaBuilder.CreateTable("SiteSettingsRecord", table => table SchemaBuilder.CreateTable("SiteSettingsRecord", table => table
.Column<int>("Id", column => column.PrimaryKey()) .ContentPartRecord()
.Column<string>("SiteSalt") .Column<string>("SiteSalt")
.Column<string>("SiteName") .Column<string>("SiteName")
.Column<string>("SuperUser") .Column<string>("SuperUser")

5
src/Orchard.Web/Core/Settings/Styles/admin.css
View File

@ -1,5 +1,6 @@
.site-cultures { .site-cultures {
font-size:1.2em; font-size:1.4em;
line-height:1.8em;
overflow:auto; overflow:auto;
} }
.site-cultures li { .site-cultures li {
@ -14,5 +15,5 @@
} }
.site-cultures div { .site-cultures div {
float:left; float:left;
width:6em; width:8em;
} }

21
src/Orchard.Web/Core/Settings/Views/Admin/Culture.ascx
View File

@ -1,18 +1,19 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<SiteCulturesViewModel>" %> <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<SiteCulturesViewModel>" %>
<%@ Import Namespace="Orchard.Core.Settings.ViewModels" %><% <%@ Import Namespace="Orchard.Core.Settings.ViewModels" %><%
Html.RegisterStyle("admin.css"); %> Html.RegisterStyle("admin.css"); %>
<h1><%:Html.TitleForPage(T("Supported Cultures").ToString()) %></h1> <h1><%:Html.TitleForPage(T("Cultures").ToString()) %></h1>
<p class="breadcrumb"><%:Html.ActionLink(T("Manage Settings").Text, "index") %><%:T(" &#62; ") %><%:T("Supported Cultures")%></p> <p class="breadcrumb"><%:Html.ActionLink(T("Manage Settings").Text, "index") %><%:T(" &#62; ") %><%:T("Supported Cultures")%></p>
<h2><%:T("Cultures this site supports") %></h2> <h3><%:T("Available Cultures") %></h3>
<% using (Html.BeginFormAntiForgeryPost("AddCulture")) { %>
<%:Html.ValidationSummary() %>
<fieldset class="addCulture">
<label for="CultureName"><%:T("Add a culture...") %></label>
<%:Html.DropDownList("CultureName", new SelectList(Model.AvailableSystemCultures.OrderBy(s => s), Model.CurrentCulture))%>
<button class="primaryAction" type="submit"><%:T("Add") %></button>
</fieldset>
<% } %>
<h3><%:T("Cultures this site supports") %></h3>
<%: Html.UnorderedList( <%: Html.UnorderedList(
Model.SiteCultures.OrderBy(s => s), Model.SiteCultures.OrderBy(s => s),
(s, i) => Html.DisplayFor(scvm => s, s == Model.CurrentCulture ? "CurrentCulture" : "RemovableCulture", ""), (s, i) => Html.DisplayFor(scvm => s, s == Model.CurrentCulture ? "CurrentCulture" : "RemovableCulture", ""),
"site-cultures", "culture", "odd")%> "site-cultures", "culture", "odd")%>
<% using (Html.BeginFormAntiForgeryPost("AddCulture")) { %>
<%:Html.ValidationSummary() %>
<fieldset>
<label for="CultureName"><%:T("Add a culture...") %></label>
<%:Html.DropDownList("CultureName", new SelectList(Model.AvailableSystemCultures.OrderBy(s => s), Model.CurrentCulture)) %>
<button class="primaryAction" type="submit"><%:T("Add") %></button>
</fieldset>
<% } %>

2
src/Orchard.Web/Modules/Futures.Widgets/DataMigrations/WidgetsDataMigration.cs
View File

@ -11,7 +11,7 @@ namespace Futures.Widgets.DataMigrations {
//CREATE TABLE Futures_Widgets_WidgetRecord (Id INTEGER not null, Zone TEXT, Position TEXT, Scope_id INTEGER, primary key (Id)); //CREATE TABLE Futures_Widgets_WidgetRecord (Id INTEGER not null, Zone TEXT, Position TEXT, Scope_id INTEGER, primary key (Id));
SchemaBuilder.CreateTable("WidgetRecord", table => table SchemaBuilder.CreateTable("WidgetRecord", table => table
.Column<int>("Id", column => column.PrimaryKey()) .ContentPartRecord()
.Column<string>("Zone") .Column<string>("Zone")
.Column<string>("Position") .Column<string>("Position")
.Column<int>("Scope_id") .Column<int>("Scope_id")

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

@ -13,7 +13,7 @@ namespace Orchard.Comments.DataMigrations {
//CREATE TABLE Orchard_Comments_CommentRecord (Id INTEGER not null, Author TEXT, SiteName TEXT, UserName TEXT, Email TEXT, Status TEXT, CommentDateUtc DATETIME, CommentText TEXT, CommentedOn INTEGER, CommentedOnContainer INTEGER, primary key (Id)); //CREATE TABLE Orchard_Comments_CommentRecord (Id INTEGER not null, Author TEXT, SiteName TEXT, UserName TEXT, Email TEXT, Status TEXT, CommentDateUtc DATETIME, CommentText TEXT, CommentedOn INTEGER, CommentedOnContainer INTEGER, primary key (Id));
SchemaBuilder.CreateTable("CommentRecord", table => table SchemaBuilder.CreateTable("CommentRecord", table => table
.Column<int>("Id", column => column.PrimaryKey()) .ContentPartRecord()
.Column<string>("Author") .Column<string>("Author")
.Column<string>("SiteName") .Column<string>("SiteName")
.Column<string>("UserName") .Column<string>("UserName")
@ -27,7 +27,7 @@ namespace Orchard.Comments.DataMigrations {
//CREATE TABLE Orchard_Comments_CommentSettingsRecord (Id INTEGER not null, ModerateComments INTEGER, EnableSpamProtection INTEGER, AkismetKey TEXT, AkismetUrl TEXT, primary key (Id)); //CREATE TABLE Orchard_Comments_CommentSettingsRecord (Id INTEGER not null, ModerateComments INTEGER, EnableSpamProtection INTEGER, AkismetKey TEXT, AkismetUrl TEXT, primary key (Id));
SchemaBuilder.CreateTable("CommentSettingsRecord", table => table SchemaBuilder.CreateTable("CommentSettingsRecord", table => table
.Column<int>("Id", column => column.PrimaryKey()) .ContentPartRecord()
.Column<bool>("ModerateComments") .Column<bool>("ModerateComments")
.Column<bool>("EnableSpamProtection") .Column<bool>("EnableSpamProtection")
.Column<string>("AkismetKey") .Column<string>("AkismetKey")
@ -36,7 +36,7 @@ namespace Orchard.Comments.DataMigrations {
//CREATE TABLE Orchard_Comments_HasCommentsRecord (Id INTEGER not null, CommentsShown INTEGER, CommentsActive INTEGER, primary key (Id)); //CREATE TABLE Orchard_Comments_HasCommentsRecord (Id INTEGER not null, CommentsShown INTEGER, CommentsActive INTEGER, primary key (Id));
SchemaBuilder.CreateTable("HasCommentsRecord", table => table SchemaBuilder.CreateTable("HasCommentsRecord", table => table
.Column<int>("Id", column => column.PrimaryKey()) .ContentPartRecord()
.Column<bool>("CommentsShown") .Column<bool>("CommentsShown")
.Column<bool>("CommentsActive") .Column<bool>("CommentsActive")
); );

16
src/Orchard.Web/Modules/Orchard.DevTools/Commands/ScaffoldingCommands.cs
View File

@ -32,6 +32,7 @@ namespace Orchard.DevTools.Commands {
string dataMigrationsPath = HostingEnvironment.MapPath("~/Modules/" + extension.Name + "/DataMigrations/"); string dataMigrationsPath = HostingEnvironment.MapPath("~/Modules/" + extension.Name + "/DataMigrations/");
string dataMigrationPath = dataMigrationsPath + extension.DisplayName + "DataMigration.cs"; string dataMigrationPath = dataMigrationsPath + extension.DisplayName + "DataMigration.cs";
string templatesPath = HostingEnvironment.MapPath("~/Modules/Orchard.DevTools/ScaffoldingTemplates/"); string templatesPath = HostingEnvironment.MapPath("~/Modules/Orchard.DevTools/ScaffoldingTemplates/");
string moduleCsProjPath = HostingEnvironment.MapPath(string.Format("~/Modules/{0}/{0}.csproj", extension.Name));
if ( !Directory.Exists(dataMigrationsPath) ) { if ( !Directory.Exists(dataMigrationsPath) ) {
Directory.CreateDirectory(dataMigrationsPath); Directory.CreateDirectory(dataMigrationsPath);
} }
@ -55,7 +56,20 @@ namespace Orchard.DevTools.Commands {
dataMigrationText = dataMigrationText.Replace("$$ClassName$$", extension.DisplayName); dataMigrationText = dataMigrationText.Replace("$$ClassName$$", extension.DisplayName);
dataMigrationText = dataMigrationText.Replace("$$Commands$$", stringWriter.ToString()); dataMigrationText = dataMigrationText.Replace("$$Commands$$", stringWriter.ToString());
File.WriteAllText(dataMigrationPath, dataMigrationText); File.WriteAllText(dataMigrationPath, dataMigrationText);
Context.Output.WriteLine(T("Data migration created successfully in Module {0}", extension.DisplayName));
string projectFileText = File.ReadAllText(moduleCsProjPath);
// The string searches in solution/project files can be made aware of comment lines.
if ( projectFileText.Contains("<Compile Include") ) {
string compileReference = string.Format("<Compile Include=\"{0}\" />\r\n ", "DataMigrations\\" + extension.DisplayName + "DataMigration.cs");
projectFileText = projectFileText.Insert(projectFileText.LastIndexOf("<Compile Include"), compileReference);
}
else {
string itemGroupReference = string.Format("</ItemGroup>\r\n <ItemGroup>\r\n <Compile Include=\"{0}\" />\r\n ", "DataMigrations\\" + extension.DisplayName + "DataMigration.cs");
projectFileText = projectFileText.Insert(projectFileText.LastIndexOf("</ItemGroup>"), itemGroupReference);
}
File.WriteAllText(moduleCsProjPath, projectFileText);
Context.Output.WriteLine(T("Data migration created successfully in Module {0}", extension.Name));
return; return;
} }
} }

2
src/Orchard.Web/Modules/Orchard.DevTools/Controllers/HomeController.cs
View File

@ -4,9 +4,11 @@ using Orchard.Localization;
using Orchard.Mvc.ViewModels; using Orchard.Mvc.ViewModels;
using Orchard.Themes; using Orchard.Themes;
using Orchard.UI.Notify; using Orchard.UI.Notify;
using Orchard.UI.Admin;
namespace Orchard.DevTools.Controllers { namespace Orchard.DevTools.Controllers {
[Themed] [Themed]
[Admin]
public class HomeController : Controller { public class HomeController : Controller {
private readonly INotifier _notifier; private readonly INotifier _notifier;

2
src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/DataMigration.txt
View File

@ -5,7 +5,7 @@ namespace $$FeatureName$$.DataMigrations {
public class $$ClassName$$DataMigration : DataMigrationImpl { public class $$ClassName$$DataMigration : DataMigrationImpl {
public int Create() { public int Create() {
$$Commands$$ $$Commands$$
return 0100; return 0100;
} }

8
src/Orchard.Web/Modules/Orchard.DevTools/Services/ScaffoldingCommandInterpreter.cs
View File

@ -13,7 +13,7 @@ namespace Orchard.DevTools.Services {
} }
public override void Visit(CreateTableCommand command) { public override void Visit(CreateTableCommand command) {
_output.WriteLine("// Creating table {0}", command.Name); _output.WriteLine("\t\t\t// Creating table {0}", command.Name);
_output.WriteLine("\t\t\tSchemaBuilder.CreateTable(\"{0}\", table => table", command.Name); _output.WriteLine("\t\t\tSchemaBuilder.CreateTable(\"{0}\", table => table", command.Name);
foreach ( var createColumn in command.TableCommands.OfType<CreateColumnCommand>() ) { foreach ( var createColumn in command.TableCommands.OfType<CreateColumnCommand>() ) {
@ -22,7 +22,7 @@ namespace Orchard.DevTools.Services {
var options = new List<string>(); var options = new List<string>();
if ( createColumn.IsPrimaryKey ) { if ( createColumn.IsPrimaryKey ) {
options.Add(string.Format("WithLength({0})", createColumn.Length)); options.Add("PrimaryKey()");
} }
if ( createColumn.IsUnique ) { if ( createColumn.IsUnique ) {
@ -33,10 +33,6 @@ namespace Orchard.DevTools.Services {
options.Add("NotNull()"); options.Add("NotNull()");
} }
if ( createColumn.IsPrimaryKey ) {
options.Add("PrimaryKey()");
}
if ( createColumn.Length.HasValue ) { if ( createColumn.Length.HasValue ) {
options.Add(string.Format("WithLength({0})", createColumn.Length )); options.Add(string.Format("WithLength({0})", createColumn.Length ));
} }

2
src/Orchard.Web/Modules/Orchard.Media/DataMigrations/MediaDataMigration.cs
View File

@ -6,7 +6,7 @@ namespace Orchard.Media.DataMigrations {
public int Create() { public int Create() {
//CREATE TABLE Orchard_Media_MediaSettingsRecord (Id INTEGER not null, RootMediaFolder TEXT, primary key (Id)); //CREATE TABLE Orchard_Media_MediaSettingsRecord (Id INTEGER not null, RootMediaFolder TEXT, primary key (Id));
SchemaBuilder.CreateTable("MediaSettingsRecord", table => table SchemaBuilder.CreateTable("MediaSettingsRecord", table => table
.Column<int>("Id", column => column.PrimaryKey()) .ContentPartRecord()
.Column<string>("RootMediaFolder") .Column<string>("RootMediaFolder")
); );

2
src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.ascx
View File

@ -17,7 +17,7 @@
<ul class="pageStatus" style="color:#666; margin:.6em 0 0 0;"> <ul class="pageStatus" style="color:#666; margin:.6em 0 0 0;">
<li><%:T("Features: {0}", MvcHtmlString.Create(string.Join(", ", module.Features.Select(f => Html.Link(f.Name, string.Format("{0}#{1}", Url.Action("features", new { area = "Orchard.Modules" }), f.Name.AsFeatureId(n => T(n)))).ToString()).OrderBy(s => s).ToArray()))) %></li> <li><%:T("Features: {0}", MvcHtmlString.Create(string.Join(", ", module.Features.Select(f => Html.Link(f.Name, string.Format("{0}#{1}", Url.Action("features", new { area = "Orchard.Modules" }), f.Name.AsFeatureId(n => T(n)))).ToString()).OrderBy(s => s).ToArray()))) %></li>
<li>&nbsp;&#124;&nbsp;<%: T("Author: {0}", !string.IsNullOrEmpty(module.Author) ? module.Author : (new []{"Bradley", "Bertrand", "Renaud", "Suha", "Sebastien", "Jon", "Nathan", "Erik"})[(module.DisplayName.Length + (new Random()).Next()) % 7]) %></li><%-- very efficient, I know --%> <li>&nbsp;&#124;&nbsp;<%: T("Author: {0}", !string.IsNullOrEmpty(module.Author) ? module.Author : (new []{"Bradley", "Bertrand", "Renaud", "Suha", "Sebastien", "Jon", "Nathan", "Erik"})[(module.DisplayName.Length + (new Random()).Next()) % 7]) %></li><%-- very efficient, I know --%>
<li>&nbsp;&#124;&nbsp;<%: T("Website: {0}", !string.IsNullOrEmpty(module.HomePage) ? module.HomePage : T("<a href=\"http://orchardproject.net\">http://orchardproject.net</a>").ToString())%></li> <li>&nbsp;&#124;&nbsp;<%: T("Website: {0}", !string.IsNullOrEmpty(module.HomePage) ? module.HomePage : "http://orchardproject.net")%></li>
</ul> </ul>
</div> </div>
</div> </div>

4
src/Orchard.Web/Modules/Orchard.Sandbox/DataMigrations/SandBoxDataMigration.cs
View File

@ -5,12 +5,12 @@ namespace Orchard.Sandbox.DataMigrations {
public int Create() { public int Create() {
SchemaBuilder.CreateTable("SandboxPageRecord", table => table SchemaBuilder.CreateTable("SandboxPageRecord", table => table
.Column<int>("Id", column => column.PrimaryKey()) .ContentPartRecord()
.Column<string>("Name") .Column<string>("Name")
); );
SchemaBuilder.CreateTable("SandboxSettingsRecord", table => table SchemaBuilder.CreateTable("SandboxSettingsRecord", table => table
.Column<int>("Id", column => column.PrimaryKey()) .ContentPartRecord()
.Column<bool>("AllowAnonymousEdits") .Column<bool>("AllowAnonymousEdits")
); );

2
src/Orchard.Web/Modules/Orchard.Search/DataMigrations/SearchDataMigration.cs
View File

@ -6,7 +6,7 @@ namespace Orchard.Search.DataMigrations {
public int Create() { public int Create() {
SchemaBuilder.CreateTable("SearchSettingsRecord", table => table SchemaBuilder.CreateTable("SearchSettingsRecord", table => table
.Column<int>("Id", column => column.PrimaryKey()) .ContentPartRecord()
.Column<bool>("FilterCulture") .Column<bool>("FilterCulture")
.Column<string>("SearchedFields") .Column<string>("SearchedFields")
); );

2
src/Orchard.Web/Modules/Orchard.Search/Models/SearchSettingsRecord.cs
View File

@ -6,7 +6,7 @@ namespace Orchard.Search.Models {
public virtual string SearchedFields { get; set; } public virtual string SearchedFields { get; set; }
public SearchSettingsRecord() { public SearchSettingsRecord() {
FilterCulture = true; FilterCulture = false;
SearchedFields = "body, title"; SearchedFields = "body, title";
} }
} }

4
src/Orchard.Web/Modules/Orchard.Themes/DataMigrations/ThemesDataMigration.cs
View File

@ -6,7 +6,7 @@ namespace Orchard.Themes.DataMigrations {
public int Create() { public int Create() {
//CREATE TABLE Orchard_Themes_ThemeRecord (Id INTEGER not null, ThemeName TEXT, DisplayName TEXT, Description TEXT, Version TEXT, Author TEXT, HomePage TEXT, Tags TEXT, primary key (Id)); //CREATE TABLE Orchard_Themes_ThemeRecord (Id INTEGER not null, ThemeName TEXT, DisplayName TEXT, Description TEXT, Version TEXT, Author TEXT, HomePage TEXT, Tags TEXT, primary key (Id));
SchemaBuilder.CreateTable("ThemeRecord", table => table SchemaBuilder.CreateTable("ThemeRecord", table => table
.Column<int>("Id", column => column.PrimaryKey()) .ContentPartRecord()
.Column<string>("ThemeName") .Column<string>("ThemeName")
.Column<string>("DisplayName") .Column<string>("DisplayName")
.Column<string>("Description") .Column<string>("Description")
@ -18,7 +18,7 @@ namespace Orchard.Themes.DataMigrations {
//CREATE TABLE Orchard_Themes_ThemeSiteSettingsRecord (Id INTEGER not null, CurrentThemeName TEXT, primary key (Id)); //CREATE TABLE Orchard_Themes_ThemeSiteSettingsRecord (Id INTEGER not null, CurrentThemeName TEXT, primary key (Id));
SchemaBuilder.CreateTable("ThemeSiteSettingsRecord", table => table SchemaBuilder.CreateTable("ThemeSiteSettingsRecord", table => table
.Column<int>("Id", column => column.PrimaryKey()) .ContentPartRecord()
.Column<string>("CurrentThemeName") .Column<string>("CurrentThemeName")
); );

2
src/Orchard.Web/Modules/Orchard.Users/DataMigrations/UsersDataMigration.cs
View File

@ -6,7 +6,7 @@ namespace Orchard.Users.DataMigrations {
public int Create() { public int Create() {
//CREATE TABLE Orchard_Users_UserRecord (Id INTEGER not null, UserName TEXT, Email TEXT, NormalizedUserName TEXT, Password TEXT, PasswordFormat TEXT, PasswordSalt TEXT, primary key (Id)); //CREATE TABLE Orchard_Users_UserRecord (Id INTEGER not null, UserName TEXT, Email TEXT, NormalizedUserName TEXT, Password TEXT, PasswordFormat TEXT, PasswordSalt TEXT, primary key (Id));
SchemaBuilder.CreateTable("UserRecord", table => table SchemaBuilder.CreateTable("UserRecord", table => table
.Column<int>("Id", column => column.PrimaryKey()) .ContentPartRecord()
.Column<string>("UserName") .Column<string>("UserName")
.Column<string>("Email") .Column<string>("Email")
.Column<string>("NormalizedUserName") .Column<string>("NormalizedUserName")

2
src/Orchard.Web/Themes/TheAdmin/Styles/site.css
View File

@ -397,7 +397,7 @@ label input {
} }
/* todo: (heskew) try to get .text on stuff like .text-box */ /* todo: (heskew) try to get .text on stuff like .text-box */
select, textarea, input.text, input.textMedium, input.text-box { select, textarea, input.text, input.textMedium, input.text-box {
padding:2px; padding:1px;
border:1px solid #bdbcbc; border:1px solid #bdbcbc;
} }
input.text, input.textMedium, input.text-box { input.text, input.textMedium, input.text-box {

16
src/Orchard/Commands/CommandHostEnvironment.cs
View File

@ -1,9 +1,17 @@
using System; using System;
using System.Linq;
using System.Web.Hosting; using System.Web.Hosting;
using Orchard.Environment; using Orchard.Environment;
using Orchard.Localization;
namespace Orchard.Commands { namespace Orchard.Commands {
public class CommandHostEnvironment : IHostEnvironment { public class CommandHostEnvironment : IHostEnvironment {
public CommandHostEnvironment() {
T = NullLocalizer.Instance;
}
public Localizer T { get; set; }
public bool IsFullTrust { public bool IsFullTrust {
get { return AppDomain.CurrentDomain.IsFullyTrusted; } get { return AppDomain.CurrentDomain.IsFullyTrusted; }
} }
@ -12,12 +20,16 @@ namespace Orchard.Commands {
return HostingEnvironment.MapPath(virtualPath); return HostingEnvironment.MapPath(virtualPath);
} }
public bool IsAssemblyLoaded(string name) {
return AppDomain.CurrentDomain.GetAssemblies().Any(a => a.GetName().Name == name);
}
public void RestartAppDomain() { public void RestartAppDomain() {
//Don't restart AppDomain in command line environment ResetSiteCompilation();
} }
public void ResetSiteCompilation() { public void ResetSiteCompilation() {
//Don't restart AppDomain in command line environment throw new OrchardCoreException(T("A change of configuration requires the application to be restarted. Running the command again usually solves this problem."));
} }
} }
} }

12
src/Orchard/Data/Migration/Generator/SchemaCommandGenerator.cs
View File

@ -35,13 +35,19 @@ namespace Orchard.Data.Migration.Generator {
var tablesField = typeof(Configuration).GetField("tables", BindingFlags.Instance | BindingFlags.NonPublic); var tablesField = typeof(Configuration).GetField("tables", BindingFlags.Instance | BindingFlags.NonPublic);
var tables = ((IDictionary<string, Table>) tablesField.GetValue(configuration)).Values; var tables = ((IDictionary<string, Table>) tablesField.GetValue(configuration)).Values;
string prefix = feature.Replace(".", "_") + "_";
foreach(var table in tables.Where(t => parameters.RecordDescriptors.Any(rd => rd.Feature.Descriptor.Name == feature && rd.TableName == t.Name))) { foreach(var table in tables.Where(t => parameters.RecordDescriptors.Any(rd => rd.Feature.Descriptor.Name == feature && rd.TableName == t.Name))) {
if(drop) { string tableName = table.Name;
yield return new DropTableCommand(table.Name); if(tableName.StartsWith(prefix)) {
tableName = tableName.Substring(prefix.Length);
} }
var command = new CreateTableCommand(table.Name); if(drop) {
yield return new DropTableCommand(tableName);
}
var command = new CreateTableCommand(tableName);
foreach(var column in table.ColumnIterator) { foreach(var column in table.ColumnIterator) {
var table1 = table; var table1 = table;

15
src/Orchard/Data/Migration/Schema/CreateTableCommand.cs
View File

@ -23,16 +23,23 @@ namespace Orchard.Data.Migration.Schema {
return Column(columnName, dbType, column); return Column(columnName, dbType, column);
} }
/// <summary>
/// Defines a primary column as for content parts
/// </summary>
public CreateTableCommand ContentPartRecord() { public CreateTableCommand ContentPartRecord() {
/// TODO: Call Column() with necessary information for content part records Column<int>("Id", column => column.PrimaryKey());
return this; return this;
} }
public CreateTableCommand VersionedContentPartRecord() { /// <summary>
/// TODO: Call Column() with necessary information for content part records /// Defines a primary column as for versionnable content parts
/// </summary>
public CreateTableCommand ContentPartVersionRecord() {
Column<int>("Id", column => column.PrimaryKey());
Column<int>("ContentItemRecord_id");
return this; return this;
} }
} }
} }

4
src/Orchard/Environment/Extensions/ExtensionLoaderCoordinator.cs
View File

@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using Orchard.Caching; using Orchard.Caching;
@ -112,7 +112,7 @@ namespace Orchard.Environment.Extensions {
.Select(e => context.ProcessedExtensions[e.Name]); .Select(e => context.ProcessedExtensions[e.Name]);
var activatedExtension = extensionProbes var activatedExtension = extensionProbes
.Where(e => e.Loader.IsCompatibleWithReferences(extension, processedModuleReferences)) .Where(e => e.Loader.IsCompatibleWithModuleReferences(extension, processedModuleReferences))
.FirstOrDefault(); .FirstOrDefault();
var previousDependency = context.PreviousDependencies.Where(d => StringComparer.OrdinalIgnoreCase.Equals(d.Name, extension.Name)).FirstOrDefault(); var previousDependency = context.PreviousDependencies.Where(d => StringComparer.OrdinalIgnoreCase.Equals(d.Name, extension.Name)).FirstOrDefault();

6
src/Orchard/Environment/Extensions/Loaders/ExtensionLoaderBase.cs
View File

@ -25,7 +25,7 @@ namespace Orchard.Environment.Extensions.Loaders {
return null; return null;
} }
public virtual bool IsCompatibleWithReferences(ExtensionDescriptor extension, IEnumerable<ExtensionProbeEntry> references) { public virtual bool IsCompatibleWithModuleReferences(ExtensionDescriptor extension, IEnumerable<ExtensionProbeEntry> references) {
return true; return true;
} }
@ -57,9 +57,5 @@ namespace Orchard.Environment.Extensions.Loaders {
public virtual IEnumerable<string> GetWebFormVirtualDependencies(DependencyDescriptor dependency) { public virtual IEnumerable<string> GetWebFormVirtualDependencies(DependencyDescriptor dependency) {
return Enumerable.Empty<string>(); return Enumerable.Empty<string>();
} }
protected static bool IsAssemblyLoaded(string moduleName) {
return AppDomain.CurrentDomain.GetAssemblies().Any(a => a.GetName().Name == moduleName);
}
} }
} }

4
src/Orchard/Environment/Extensions/Loaders/IExtensionLoader.cs
View File

@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Reflection; using System.Reflection;
using Orchard.Caching; using Orchard.Caching;
@ -29,7 +29,7 @@ namespace Orchard.Environment.Extensions.Loaders {
Assembly LoadReference(DependencyReferenceDescriptor reference); Assembly LoadReference(DependencyReferenceDescriptor reference);
void ReferenceActivated(ExtensionLoadingContext context, ExtensionReferenceProbeEntry referenceEntry); void ReferenceActivated(ExtensionLoadingContext context, ExtensionReferenceProbeEntry referenceEntry);
void ReferenceDeactivated(ExtensionLoadingContext context, ExtensionReferenceProbeEntry referenceEntry); void ReferenceDeactivated(ExtensionLoadingContext context, ExtensionReferenceProbeEntry referenceEntry);
bool IsCompatibleWithReferences(ExtensionDescriptor extension, IEnumerable<ExtensionProbeEntry> references); bool IsCompatibleWithModuleReferences(ExtensionDescriptor extension, IEnumerable<ExtensionProbeEntry> references);
ExtensionProbeEntry Probe(ExtensionDescriptor descriptor); ExtensionProbeEntry Probe(ExtensionDescriptor descriptor);
ExtensionEntry Load(ExtensionDescriptor descriptor); ExtensionEntry Load(ExtensionDescriptor descriptor);

19
src/Orchard/Environment/Extensions/Loaders/PrecompiledExtensionLoader.cs
View File

@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
@ -15,16 +15,19 @@ namespace Orchard.Environment.Extensions.Loaders {
/// extension directory. /// extension directory.
/// </summary> /// </summary>
public class PrecompiledExtensionLoader : ExtensionLoaderBase { public class PrecompiledExtensionLoader : ExtensionLoaderBase {
private readonly IHostEnvironment _hostEnvironment;
private readonly IAssemblyProbingFolder _assemblyProbingFolder; private readonly IAssemblyProbingFolder _assemblyProbingFolder;
private readonly IVirtualPathProvider _virtualPathProvider; private readonly IVirtualPathProvider _virtualPathProvider;
private readonly IVirtualPathMonitor _virtualPathMonitor; private readonly IVirtualPathMonitor _virtualPathMonitor;
public PrecompiledExtensionLoader(IDependenciesFolder dependenciesFolder, public PrecompiledExtensionLoader(
IHostEnvironment hostEnvironment,
IDependenciesFolder dependenciesFolder,
IAssemblyProbingFolder assemblyProbingFolder, IAssemblyProbingFolder assemblyProbingFolder,
IVirtualPathProvider virtualPathProvider, IVirtualPathProvider virtualPathProvider,
IVirtualPathMonitor virtualPathMonitor) IVirtualPathMonitor virtualPathMonitor)
: base(dependenciesFolder) { : base(dependenciesFolder) {
_hostEnvironment = hostEnvironment;
_assemblyProbingFolder = assemblyProbingFolder; _assemblyProbingFolder = assemblyProbingFolder;
_virtualPathProvider = virtualPathProvider; _virtualPathProvider = virtualPathProvider;
_virtualPathMonitor = virtualPathMonitor; _virtualPathMonitor = virtualPathMonitor;
@ -53,7 +56,7 @@ namespace Orchard.Environment.Extensions.Loaders {
}); });
// We need to restart the appDomain if the assembly is loaded // We need to restart the appDomain if the assembly is loaded
if (IsAssemblyLoaded(dependency.Name)) { if (_hostEnvironment.IsAssemblyLoaded(dependency.Name)) {
Logger.Information("ExtensionRemoved: Module \"{0}\" is removed and its assembly is loaded, forcing AppDomain restart", dependency.Name); Logger.Information("ExtensionRemoved: Module \"{0}\" is removed and its assembly is loaded, forcing AppDomain restart", dependency.Name);
ctx.RestartAppDomain = true; ctx.RestartAppDomain = true;
} }
@ -72,7 +75,7 @@ namespace Orchard.Environment.Extensions.Loaders {
ctx.CopyActions.Add(() => _assemblyProbingFolder.StoreAssembly(extension.Name, sourceFileName)); ctx.CopyActions.Add(() => _assemblyProbingFolder.StoreAssembly(extension.Name, sourceFileName));
// We need to restart the appDomain if the assembly is loaded // We need to restart the appDomain if the assembly is loaded
if (IsAssemblyLoaded(extension.Name)) { if (_hostEnvironment.IsAssemblyLoaded(extension.Name)) {
Logger.Information("ExtensionRemoved: Module \"{0}\" is activated with newer file and its assembly is loaded, forcing AppDomain restart", extension.Name); Logger.Information("ExtensionRemoved: Module \"{0}\" is activated with newer file and its assembly is loaded, forcing AppDomain restart", extension.Name);
ctx.RestartAppDomain = true; ctx.RestartAppDomain = true;
} }
@ -88,7 +91,7 @@ namespace Orchard.Environment.Extensions.Loaders {
}); });
// We need to restart the appDomain if the assembly is loaded // We need to restart the appDomain if the assembly is loaded
if (IsAssemblyLoaded(extension.Name)) { if (_hostEnvironment.IsAssemblyLoaded(extension.Name)) {
Logger.Information("ExtensionDeactivated: Module \"{0}\" is deactivated and its assembly is loaded, forcing AppDomain restart", extension.Name); Logger.Information("ExtensionDeactivated: Module \"{0}\" is deactivated and its assembly is loaded, forcing AppDomain restart", extension.Name);
ctx.RestartAppDomain = true; ctx.RestartAppDomain = true;
} }
@ -110,7 +113,7 @@ namespace Orchard.Environment.Extensions.Loaders {
context.CopyActions.Add(() => _assemblyProbingFolder.StoreAssembly(referenceEntry.Name, sourceFileName)); context.CopyActions.Add(() => _assemblyProbingFolder.StoreAssembly(referenceEntry.Name, sourceFileName));
// We need to restart the appDomain if the assembly is loaded // We need to restart the appDomain if the assembly is loaded
if (IsAssemblyLoaded(referenceEntry.Name)) { if (_hostEnvironment.IsAssemblyLoaded(referenceEntry.Name)) {
Logger.Information("ReferenceActivated: Reference \"{0}\" is activated with newer file and its assembly is loaded, forcing AppDomain restart", referenceEntry.Name); Logger.Information("ReferenceActivated: Reference \"{0}\" is activated with newer file and its assembly is loaded, forcing AppDomain restart", referenceEntry.Name);
context.RestartAppDomain = true; context.RestartAppDomain = true;
} }
@ -143,7 +146,7 @@ namespace Orchard.Environment.Extensions.Loaders {
} ); } );
} }
public override bool IsCompatibleWithReferences(ExtensionDescriptor extension, IEnumerable<ExtensionProbeEntry> references) { public override bool IsCompatibleWithModuleReferences(ExtensionDescriptor extension, IEnumerable<ExtensionProbeEntry> references) {
// A pre-compiled module is _not_ compatible with a dynamically loaded module // A pre-compiled module is _not_ compatible with a dynamically loaded module
// because a pre-compiled module usually references a pre-compiled assembly binary // because a pre-compiled module usually references a pre-compiled assembly binary
// which will have a different identity (i.e. name) from the dynamic module. // which will have a different identity (i.e. name) from the dynamic module.

13
src/Orchard/Environment/Extensions/Loaders/ProbingExtensionLoader.cs
View File

@ -10,12 +10,17 @@ namespace Orchard.Environment.Extensions.Loaders {
/// file can be found in the "App_Data/Dependencies" folder. /// file can be found in the "App_Data/Dependencies" folder.
/// </summary> /// </summary>
public class ProbingExtensionLoader : ExtensionLoaderBase { public class ProbingExtensionLoader : ExtensionLoaderBase {
private readonly IHostEnvironment _hostEnvironment;
private readonly IDependenciesFolder _dependenciesFolder; private readonly IDependenciesFolder _dependenciesFolder;
private readonly IAssemblyProbingFolder _assemblyProbingFolder; private readonly IAssemblyProbingFolder _assemblyProbingFolder;
public ProbingExtensionLoader(IDependenciesFolder dependenciesFolder, IAssemblyProbingFolder assemblyProbingFolder) public ProbingExtensionLoader(
IHostEnvironment hostEnvironment,
IDependenciesFolder dependenciesFolder,
IAssemblyProbingFolder assemblyProbingFolder)
: base(dependenciesFolder) { : base(dependenciesFolder) {
_hostEnvironment = hostEnvironment;
_dependenciesFolder = dependenciesFolder; _dependenciesFolder = dependenciesFolder;
_assemblyProbingFolder = assemblyProbingFolder; _assemblyProbingFolder = assemblyProbingFolder;
Logger = NullLogger.Instance; Logger = NullLogger.Instance;
@ -42,7 +47,7 @@ namespace Orchard.Environment.Extensions.Loaders {
}); });
// We need to restart the appDomain if the assembly is loaded // We need to restart the appDomain if the assembly is loaded
if (IsAssemblyLoaded(dependency.Name)) { if (_hostEnvironment.IsAssemblyLoaded(dependency.Name)) {
Logger.Information("ExtensionRemoved: Module \"{0}\" is removed and its assembly is loaded, forcing AppDomain restart", dependency.Name); Logger.Information("ExtensionRemoved: Module \"{0}\" is removed and its assembly is loaded, forcing AppDomain restart", dependency.Name);
ctx.RestartAppDomain = true; ctx.RestartAppDomain = true;
} }
@ -58,14 +63,14 @@ namespace Orchard.Environment.Extensions.Loaders {
}); });
// We need to restart the appDomain if the assembly is loaded // We need to restart the appDomain if the assembly is loaded
if (IsAssemblyLoaded(extension.Name)) { if (_hostEnvironment.IsAssemblyLoaded(extension.Name)) {
Logger.Information("ExtensionDeactivated: Module \"{0}\" is deactivated and its assembly is loaded, forcing AppDomain restart", extension.Name); Logger.Information("ExtensionDeactivated: Module \"{0}\" is deactivated and its assembly is loaded, forcing AppDomain restart", extension.Name);
ctx.RestartAppDomain = true; ctx.RestartAppDomain = true;
} }
} }
} }
public override bool IsCompatibleWithReferences(ExtensionDescriptor extension, IEnumerable<ExtensionProbeEntry> references) { public override bool IsCompatibleWithModuleReferences(ExtensionDescriptor extension, IEnumerable<ExtensionProbeEntry> references) {
// A pre-compiled module is _not_ compatible with a dynamically loaded module // A pre-compiled module is _not_ compatible with a dynamically loaded module
// because a pre-compiled module usually references a pre-compiled assembly binary // because a pre-compiled module usually references a pre-compiled assembly binary
// which will have a different identity (i.e. name) from the dynamic module. // which will have a different identity (i.e. name) from the dynamic module.

1
src/Orchard/Environment/Extensions/Loaders/ReferencedExtensionLoader.cs
View File

@ -45,6 +45,7 @@ namespace Orchard.Environment.Extensions.Loaders {
Logger.Information("ExtensionRemoved: Deleting assembly \"{0}\" from bin directory (AppDomain will restart)", moduleName); Logger.Information("ExtensionRemoved: Deleting assembly \"{0}\" from bin directory (AppDomain will restart)", moduleName);
File.Delete(_virtualPathProvider.MapPath(assemblyPath)); File.Delete(_virtualPathProvider.MapPath(assemblyPath));
}); });
ctx.RestartAppDomain = true;
} }
} }

7
src/Orchard/Environment/IHostEnvironment.cs
View File

@ -1,5 +1,6 @@
using System; using System;
using System.IO; using System.IO;
using System.Linq;
using System.Web; using System.Web;
using System.Web.Hosting; using System.Web.Hosting;
using Orchard.Services; using Orchard.Services;
@ -13,6 +14,8 @@ namespace Orchard.Environment {
bool IsFullTrust { get; } bool IsFullTrust { get; }
string MapPath(string virtualPath); string MapPath(string virtualPath);
bool IsAssemblyLoaded(string name);
void RestartAppDomain(); void RestartAppDomain();
void ResetSiteCompilation(); void ResetSiteCompilation();
} }
@ -32,6 +35,10 @@ namespace Orchard.Environment {
return HostingEnvironment.MapPath(virtualPath); return HostingEnvironment.MapPath(virtualPath);
} }
public bool IsAssemblyLoaded(string name) {
return AppDomain.CurrentDomain.GetAssemblies().Any(a => a.GetName().Name == name);
}
public void RestartAppDomain() { public void RestartAppDomain() {
ResetSiteCompilation(); ResetSiteCompilation();
} }