diff --git a/Orchard.proj b/Orchard.proj index 1ca555008..5f1ae878d 100644 --- a/Orchard.proj +++ b/Orchard.proj @@ -27,6 +27,7 @@ x64 x86 + Release $(BUILD_NUMBER) @@ -115,7 +116,7 @@ + Properties="Configuration=$(Configuration);OutputPath=$(CompileFolder)" /> + Properties="Configuration=$(Configuration);OutputPath=$(MsBuildTasksFolder)" /> @@ -273,19 +274,19 @@ diff --git a/src/Gulpfile.js b/src/Gulpfile.js index 05b62a89e..fce38f9fe 100644 --- a/src/Gulpfile.js +++ b/src/Gulpfile.js @@ -74,15 +74,15 @@ function getAssetGroups() { function resolveAssetGroupPaths(assetGroup, assetManifestPath) { assetGroup.basePath = path.dirname(assetManifestPath); assetGroup.inputPaths = assetGroup.inputs.map(function (inputPath) { - return path.join(assetGroup.basePath, inputPath); + return path.resolve(path.join(assetGroup.basePath, inputPath)); }); assetGroup.watchPaths = []; if (!!assetGroup.watch) { assetGroup.watchPaths = assetGroup.watch.map(function (watchPath) { - return path.join(assetGroup.basePath, watchPath); + return path.resolve(path.join(assetGroup.basePath, watchPath)); }); } - assetGroup.outputPath = path.join(assetGroup.basePath, assetGroup.output); + assetGroup.outputPath = path.resolve(path.join(assetGroup.basePath, assetGroup.output)); assetGroup.outputDir = path.dirname(assetGroup.outputPath); assetGroup.outputFileName = path.basename(assetGroup.output); } diff --git a/src/Orchard.Tests/ContentManagement/DynamicContentItemTests.cs b/src/Orchard.Tests/ContentManagement/DynamicContentItemTests.cs index ba90a629e..0c82d68e8 100644 --- a/src/Orchard.Tests/ContentManagement/DynamicContentItemTests.cs +++ b/src/Orchard.Tests/ContentManagement/DynamicContentItemTests.cs @@ -76,5 +76,39 @@ namespace Orchard.Tests.ContentManagement { Assert.That((object)testingPartDynamic, Is.AssignableTo>()); } + + + [Test] + public void NullCheckingCanBeDoneOnProperties() { + var contentItem = new ContentItem(); + var contentPart = new ContentPart { TypePartDefinition = new ContentTypePartDefinition(new ContentPartDefinition("FooPart"), new SettingsDictionary()) }; + var contentField = new ContentField { PartFieldDefinition = new ContentPartFieldDefinition(new ContentFieldDefinition("FooType"), "FooField", new SettingsDictionary()) }; + + dynamic item = contentItem; + dynamic part = contentPart; + + Assert.That(item.FooPart == null, Is.True); + Assert.That(item.FooPart != null, Is.False); + + contentItem.Weld(contentPart); + + Assert.That(item.FooPart == null, Is.False); + Assert.That(item.FooPart != null, Is.True); + Assert.That(item.FooPart, Is.SameAs(contentPart)); + + Assert.That(part.FooField == null, Is.True); + Assert.That(part.FooField != null, Is.False); + Assert.That(item.FooPart.FooField == null, Is.True); + Assert.That(item.FooPart.FooField != null, Is.False); + + contentPart.Weld(contentField); + + Assert.That(part.FooField == null, Is.False); + Assert.That(part.FooField != null, Is.True); + Assert.That(item.FooPart.FooField == null, Is.False); + Assert.That(item.FooPart.FooField != null, Is.True); + Assert.That(part.FooField, Is.SameAs(contentField)); + Assert.That(item.FooPart.FooField, Is.SameAs(contentField)); + } } } diff --git a/src/Orchard.Web/Core/Contents/Views/Admin/Create.cshtml b/src/Orchard.Web/Core/Contents/Views/Admin/Create.cshtml index 68c10887c..9bb4def2a 100644 --- a/src/Orchard.Web/Core/Contents/Views/Admin/Create.cshtml +++ b/src/Orchard.Web/Core/Contents/Views/Admin/Create.cshtml @@ -4,9 +4,8 @@ @{ ContentItem contentItem = Model.ContentItem; var typeDisplayName = contentItem.TypeDefinition.DisplayName ?? contentItem.ContentType.CamelFriendly(); - var pageTitle = T("New {0}", typeDisplayName); - Layout.Title = (string)pageTitle.Text; + Layout.Title = T("New {0}", Html.Raw(typeDisplayName)).Text; } @using (Html.BeginFormAntiForgeryPost(Url.Action("Create", new { ReturnUrl = Request.QueryString["ReturnUrl"] }), FormMethod.Post, new { enctype = "multipart/form-data" })) { diff --git a/src/Orchard.Web/Core/Contents/Views/Admin/List.cshtml b/src/Orchard.Web/Core/Contents/Views/Admin/List.cshtml index a678329b5..130ddf957 100644 --- a/src/Orchard.Web/Core/Contents/Views/Admin/List.cshtml +++ b/src/Orchard.Web/Core/Contents/Views/Admin/List.cshtml @@ -4,13 +4,13 @@ var pageTitle = T("Manage Content"); var createLinkText = T("Create New Content"); if (!string.IsNullOrWhiteSpace(typeDisplayName)) { - pageTitle = T("Manage {0} Content", typeDisplayName); - createLinkText = T("Create New {0}", typeDisplayName); + pageTitle = T("Manage {0} Content", Html.Raw(typeDisplayName)); + createLinkText = T("Create New {0}", Html.Raw(typeDisplayName)); } IEnumerable cultures = Model.Options.Cultures; - Layout.Title = pageTitle; + Layout.Title = pageTitle.Text; }
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.cshtml index 14535ea78..8de35fe22 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.cshtml +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.cshtml @@ -2,7 +2,7 @@ @{ Style.Require("ContentTypesAdmin"); Script.Require("jQuery"); - Layout.Title = T("Edit Content Type - {0}", Model.DisplayName).ToString(); + Layout.Title = T("Edit Content Type - {0}", Html.Raw(Model.DisplayName)).Text; }
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditField.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditField.cshtml index 945ec905f..725e6b2cf 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditField.cshtml +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditField.cshtml @@ -3,7 +3,7 @@ @{ Style.Require("ContentTypesAdmin"); - Layout.Title = T("Edit Field \"{0}\"", Model.Name).ToString(); + Layout.Title = T("Edit Field \"{0}\"", Html.Raw(Model.DisplayName)).ToString(); } @using (Html.BeginFormAntiForgeryPost()) { diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/EditTypeViewModel.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/EditTypeViewModel.cshtml index bfe7535cc..a1d0804dc 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/EditTypeViewModel.cshtml +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/EditTypeViewModel.cshtml @@ -9,7 +9,7 @@

@Model.DisplayName

@if (!string.IsNullOrWhiteSpace(stereotype)) { - @stereotype} @if (creatable) { -

@Html.ActionLink(T("Create New {0}", Model.DisplayName).Text, "Create", new {area = "Contents", id = Model.Name})

+

@Html.ActionLink(T("Create New {0}", Html.Raw(Model.DisplayName)).Text, "Create", new {area = "Contents", id = Model.Name})

}
@if (creatable) { diff --git a/src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj b/src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj index 2008ad85b..74c14c623 100644 --- a/src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj +++ b/src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj @@ -157,9 +157,7 @@ - - - + diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Commands/IndexingCommands.cs b/src/Orchard.Web/Modules/Orchard.Indexing/Commands/IndexingCommands.cs index d6ecbcd0b..de99edee1 100644 --- a/src/Orchard.Web/Modules/Orchard.Indexing/Commands/IndexingCommands.cs +++ b/src/Orchard.Web/Modules/Orchard.Indexing/Commands/IndexingCommands.cs @@ -47,8 +47,19 @@ namespace Orchard.Indexing.Commands { Context.Output.WriteLine(T("Invalid index name.")); } else { - _indexManager.GetSearchIndexProvider().CreateIndex(index); - Context.Output.WriteLine(T("New index has been created successfully.")); + var indexProvider = _indexManager.GetSearchIndexProvider(); + if(indexProvider == null) { + Context.Output.WriteLine(T("New indexing service was found. Please enable a module like Lucene.")); + } + else { + if (indexProvider.Exists(index)) { + Context.Output.WriteLine(T("The specified index already exists.")); + } + else { + _indexManager.GetSearchIndexProvider().CreateIndex(index); + Context.Output.WriteLine(T("New index has been created successfully.")); + } + } } } diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Handlers/CreateIndexingTaskHandler.cs b/src/Orchard.Web/Modules/Orchard.Indexing/Handlers/CreateIndexingTaskHandler.cs index 206d2ce99..c674820d6 100644 --- a/src/Orchard.Web/Modules/Orchard.Indexing/Handlers/CreateIndexingTaskHandler.cs +++ b/src/Orchard.Web/Modules/Orchard.Indexing/Handlers/CreateIndexingTaskHandler.cs @@ -17,14 +17,13 @@ namespace Orchard.Indexing.Handlers { OnUpdated(CreateIndexingTask); OnPublished(CreateIndexingTask); OnUnpublished(CreateIndexingTask); + OnImported(CreateIndexingTask); + OnRestored(CreateIndexingTask); OnRemoved(RemoveIndexingTask); + OnDestroyed(RemoveIndexingTask); } - void CreateIndexingTask(CreateContentContext context, ContentPart part) { - _indexingTaskManager.CreateUpdateIndexTask(context.ContentItem); - } - - void CreateIndexingTask(UpdateContentContext context, ContentPart part) { + void CreateIndexingTask(ContentContextBase context, ContentPart part) { _indexingTaskManager.CreateUpdateIndexTask(context.ContentItem); } @@ -38,7 +37,7 @@ namespace Orchard.Indexing.Handlers { _indexingTaskManager.CreateUpdateIndexTask(context.ContentItem); } - void RemoveIndexingTask(RemoveContentContext context, ContentPart part) { + void RemoveIndexingTask(ContentContextBase context, ContentPart part) { _indexingTaskManager.CreateDeleteIndexTask(context.ContentItem); } } diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Fields/MediaLibraryPicker.Summary.cshtml b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Fields/MediaLibraryPicker.Summary.cshtml index c7558a982..3d5c29d66 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Fields/MediaLibraryPicker.Summary.cshtml +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Fields/MediaLibraryPicker.Summary.cshtml @@ -4,11 +4,12 @@ @{ var field = (MediaLibraryPickerField) Model.ContentField; - string name = field.DisplayName; + string displayName = field.DisplayName; + string name = field.Name; var mediaParts = field.MediaParts; } @if (mediaParts.Any()) { -@name: +@displayName:

@foreach (var contentItem in mediaParts) { @Display(BuildDisplay(contentItem, "Thumbnail")) diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Fields/MediaLibraryPicker.SummaryAdmin.cshtml b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Fields/MediaLibraryPicker.SummaryAdmin.cshtml index f899f48d9..1481eaa9c 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Fields/MediaLibraryPicker.SummaryAdmin.cshtml +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Fields/MediaLibraryPicker.SummaryAdmin.cshtml @@ -4,12 +4,13 @@ @{ var field = (MediaLibraryPickerField) Model.ContentField; - string name = field.DisplayName; + string displayName = field.DisplayName; + string name = field.Name; var mediaParts = field.MediaParts; var returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString(); } -@name: +@displayName:

@if (mediaParts.Any()) { diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Fields/MediaLibraryPicker.cshtml b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Fields/MediaLibraryPicker.cshtml index e304ca454..b0f28d16a 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Fields/MediaLibraryPicker.cshtml +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Fields/MediaLibraryPicker.cshtml @@ -4,11 +4,12 @@ @{ var field = (MediaLibraryPickerField) Model.ContentField; - string name = field.DisplayName; + string displayName = field.DisplayName; + string name = field.Name; var contents = field.MediaParts; }

-

@name

+

@displayName

@foreach(var content in contents) {
@Display(BuildDisplay(content, "Summary")) diff --git a/src/Orchard.Web/Modules/Orchard.Search/Drivers/SearchSettingsPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Search/Drivers/SearchSettingsPartDriver.cs index 88c4589ff..499a61405 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Drivers/SearchSettingsPartDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Search/Drivers/SearchSettingsPartDriver.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Linq; using System.Xml.Linq; using Orchard.ContentManagement; diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TaxonomyFieldDriver.cs b/src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TaxonomyFieldDriver.cs index ab64d3179..7cbc32363 100644 --- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TaxonomyFieldDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TaxonomyFieldDriver.cs @@ -58,7 +58,7 @@ namespace Orchard.Taxonomies.Drivers { protected override DriverResult Editor(ContentPart part, TaxonomyField field, dynamic shapeHelper) { return ContentShape("Fields_TaxonomyField_Edit", GetDifferentiator(field, part), () => { var settings = field.PartFieldDefinition.Settings.GetModel(); - var appliedTerms = _taxonomyService.GetTermsForContentItem(part.ContentItem.Id, field.Name, VersionOptions.Latest).Distinct(new TermPartComparer()).ToDictionary(t => t.Id, t => t); + var appliedTerms = GetAppliedTerms(part, field, VersionOptions.Latest).ToDictionary(t => t.Id, t => t); var taxonomy = _taxonomyService.GetTaxonomyByName(settings.Taxonomy); var terms = taxonomy != null ? _taxonomyService.GetTerms(taxonomy.Id).Where(t => !string.IsNullOrWhiteSpace(t.Name)).Select(t => t.CreateTermEntry()).ToList() @@ -82,7 +82,9 @@ namespace Orchard.Taxonomies.Drivers { protected override DriverResult Editor(ContentPart part, TaxonomyField field, IUpdateModel updater, dynamic shapeHelper) { // Initializing viewmodel using the terms that are already selected to prevent loosing them when updating an editor group this field isn't displayed in. - var viewModel = new TaxonomyFieldViewModel { Terms = field.Terms.Select(t => t.CreateTermEntry()).ToList() }; + // Get all the selected, published terms of all the TaxonomyFields of the content item. + var appliedTerms = GetAppliedTerms(part).ToList(); + var viewModel = new TaxonomyFieldViewModel { Terms = appliedTerms.Select(t => t.CreateTermEntry()).ToList() }; foreach (var item in viewModel.Terms) item.IsChecked = true; if (updater.TryUpdateModel(viewModel, GetPrefix(field, part), null, null)) { @@ -156,6 +158,13 @@ namespace Orchard.Taxonomies.Drivers { return term; } + + + private IEnumerable GetAppliedTerms(ContentPart part, TaxonomyField field = null, VersionOptions versionOptions = null) { + string fieldName = field != null ? field.Name : string.Empty; + + return _taxonomyService.GetTermsForContentItem(part.ContentItem.Id, fieldName, versionOptions?? VersionOptions.Published).Distinct(new TermPartComparer()); + } } internal class TermPartComparer : IEqualityComparer { diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Drivers/DisableThemePartDriver.cs b/src/Orchard.Web/Modules/Orchard.Themes/Drivers/DisableThemePartDriver.cs index dba20891a..a18c3aa18 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/Drivers/DisableThemePartDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Themes/Drivers/DisableThemePartDriver.cs @@ -1,6 +1,7 @@ -using System.Web; +using System.Web; using Orchard.ContentManagement.Drivers; using Orchard.Themes.Models; +using Orchard.UI.Admin; namespace Orchard.Themes.Drivers { public class DisableThemePartDriver : ContentPartDriver { @@ -11,6 +12,9 @@ namespace Orchard.Themes.Drivers { } protected override DriverResult Display(DisableThemePart part, string displayType, dynamic shapeHelper) { + if (AdminFilter.IsApplied(_httpContext.Request.RequestContext)) { + return null; + } return ContentShape("Parts_DisableTheme", () => { ThemeFilter.Disable(_httpContext.Request.RequestContext); return null; @@ -18,4 +22,4 @@ namespace Orchard.Themes.Drivers { } } -} \ No newline at end of file +} diff --git a/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj b/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj index 2c00451b7..644df795d 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj +++ b/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj @@ -219,20 +219,20 @@ - $(ProjectDir)\..\Manifests - - diff --git a/src/Orchard.Web/Modules/Orchard.Users/Services/UserNameIdentityResolver.cs b/src/Orchard.Web/Modules/Orchard.Users/Services/UserNameIdentityResolver.cs new file mode 100644 index 000000000..63aa2e7ee --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Users/Services/UserNameIdentityResolver.cs @@ -0,0 +1,37 @@ +using System.Collections.Generic; +using Orchard.ContentManagement; +using Orchard.Users.Models; + +namespace Orchard.Gallery.Services { + public class PackageIdentityResolverSelector : IIdentityResolverSelector { + private readonly IContentManager _contentManager; + + public PackageIdentityResolverSelector(IContentManager contentManager) { + _contentManager = contentManager; + } + + public IdentityResolverSelectorResult GetResolver(ContentIdentity contentIdentity) { + if (contentIdentity.Has("User.UserName")) { + return new IdentityResolverSelectorResult { + Priority = 0, + Resolve = ResolveIdentity + }; + } + + return null; + } + + private IEnumerable ResolveIdentity(ContentIdentity identity) { + var identifier = identity.Get("User.UserName"); + + if (identifier == null) { + return null; + } + + return _contentManager + .Query() + .Where(p => p.NormalizedUserName == identifier) + .List(); + } + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css b/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css index 61bbfe837..4a52c7a28 100644 --- a/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css +++ b/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css @@ -66,6 +66,7 @@ header, footer, aside, nav, article { display: block; } content: "."; display: block; height: 0; + font-size: 0; clear: both; visibility: hidden; } @@ -75,6 +76,7 @@ header, footer, aside, nav, article { display: block; } content: "."; display: block; height: 0; + font-size: 0; clear: both; visibility: hidden; } diff --git a/src/Orchard/ContentManagement/ContentItem.cs b/src/Orchard/ContentManagement/ContentItem.cs index 3441ff3e9..30dc1c34e 100644 --- a/src/Orchard/ContentManagement/ContentItem.cs +++ b/src/Orchard/ContentManagement/ContentItem.cs @@ -52,10 +52,11 @@ namespace Orchard.ContentManagement { return true; } } - return false; + result = null; + return true; } return true; } } -} \ No newline at end of file +} diff --git a/src/Orchard/ContentManagement/ContentPart.cs b/src/Orchard/ContentManagement/ContentPart.cs index 241edfa55..cdb4bbfbe 100644 --- a/src/Orchard/ContentManagement/ContentPart.cs +++ b/src/Orchard/ContentManagement/ContentPart.cs @@ -74,7 +74,8 @@ namespace Orchard.ContentManagement { return true; } } - return false; + result = null; + return true; } return true; diff --git a/src/Orchard/ContentManagement/Handlers/ContentHandler.cs b/src/Orchard/ContentManagement/Handlers/ContentHandler.cs index f52f25fca..fe53ebbaa 100644 --- a/src/Orchard/ContentManagement/Handlers/ContentHandler.cs +++ b/src/Orchard/ContentManagement/Handlers/ContentHandler.cs @@ -96,6 +96,29 @@ namespace Orchard.ContentManagement.Handlers { protected void OnIndexed(Action handler) where TPart : class, IContent { Filters.Add(new InlineStorageFilter { OnIndexed = handler }); } + protected void OnImporting(Action handler) where TPart : class, IContent { + Filters.Add(new InlineStorageFilter { OnImporting = handler }); + } + + protected void OnImported(Action handler) where TPart : class, IContent { + Filters.Add(new InlineStorageFilter { OnImported = handler }); + } + + protected void OnExporting(Action handler) where TPart : class, IContent { + Filters.Add(new InlineStorageFilter { OnExporting = handler }); + } + + protected void OnExported(Action handler) where TPart : class, IContent { + Filters.Add(new InlineStorageFilter { OnExported = handler }); + } + + protected void OnRestoring(Action handler) where TPart : class, IContent { + Filters.Add(new InlineStorageFilter { OnRestoring = handler }); + } + + protected void OnRestored(Action handler) where TPart : class, IContent { + Filters.Add(new InlineStorageFilter { OnRestored = handler }); + } protected void OnGetContentItemMetadata(Action handler) where TPart : class, IContent { Filters.Add(new InlineTemplateFilter { OnGetItemMetadata = handler }); @@ -132,6 +155,10 @@ namespace Orchard.ContentManagement.Handlers { public Action OnRemoved { get; set; } public Action OnIndexing { get; set; } public Action OnIndexed { get; set; } + public Action OnImporting { get; set; } + public Action OnImported { get; set; } + public Action OnExporting { get; set; } + public Action OnExported { get; set; } public Action OnRestoring { get; set; } public Action OnRestored { get; set; } public Action OnDestroying { get; set; } @@ -188,13 +215,29 @@ namespace Orchard.ContentManagement.Handlers { if (OnRemoved != null) OnRemoved(context, instance); } protected override void Indexing(IndexContentContext context, TPart instance) { - if ( OnIndexing != null ) + if (OnIndexing != null) OnIndexing(context, instance); } protected override void Indexed(IndexContentContext context, TPart instance) { - if ( OnIndexed != null ) + if (OnIndexed != null) OnIndexed(context, instance); } + protected override void Importing(ImportContentContext context, TPart instance) { + if (OnImporting != null) + OnImporting(context, instance); + } + protected override void Imported(ImportContentContext context, TPart instance) { + if (OnImported != null) + OnImported(context, instance); + } + protected override void Exporting(ExportContentContext context, TPart instance) { + if (OnExporting != null) + OnExporting(context, instance); + } + protected override void Exported(ExportContentContext context, TPart instance) { + if (OnExported != null) + OnExported(context, instance); + } protected override void Restoring(RestoreContentContext context, TPart instance) { if (OnRestoring != null) OnRestoring(context, instance); @@ -353,18 +396,26 @@ namespace Orchard.ContentManagement.Handlers { } void IContentHandler.Importing(ImportContentContext context) { + foreach (var filter in Filters.OfType()) + filter.Importing(context); Importing(context); } void IContentHandler.Imported(ImportContentContext context) { + foreach (var filter in Filters.OfType()) + filter.Imported(context); Imported(context); } void IContentHandler.Exporting(ExportContentContext context) { + foreach (var filter in Filters.OfType()) + filter.Exporting(context); Exporting(context); } void IContentHandler.Exported(ExportContentContext context) { + foreach (var filter in Filters.OfType()) + filter.Exported(context); Exported(context); } diff --git a/src/Orchard/ContentManagement/Handlers/IContentStorageFilter.cs b/src/Orchard/ContentManagement/Handlers/IContentStorageFilter.cs index c284d4ffd..2e461211e 100644 --- a/src/Orchard/ContentManagement/Handlers/IContentStorageFilter.cs +++ b/src/Orchard/ContentManagement/Handlers/IContentStorageFilter.cs @@ -19,6 +19,10 @@ namespace Orchard.ContentManagement.Handlers { void Removed(RemoveContentContext context); void Indexing(IndexContentContext context); void Indexed(IndexContentContext context); + void Importing(ImportContentContext context); + void Imported(ImportContentContext context); + void Exporting(ExportContentContext context); + void Exported(ExportContentContext context); void Restoring(RestoreContentContext context); void Restored(RestoreContentContext context); void Destroying(DestroyContentContext context); diff --git a/src/Orchard/ContentManagement/Handlers/StorageFilterBase.cs b/src/Orchard/ContentManagement/Handlers/StorageFilterBase.cs index fe77866fc..e7117e448 100644 --- a/src/Orchard/ContentManagement/Handlers/StorageFilterBase.cs +++ b/src/Orchard/ContentManagement/Handlers/StorageFilterBase.cs @@ -21,6 +21,10 @@ namespace Orchard.ContentManagement.Handlers { protected virtual void Removed(RemoveContentContext context, TPart instance) { } protected virtual void Indexing(IndexContentContext context, TPart instance) { } protected virtual void Indexed(IndexContentContext context, TPart instance) { } + protected virtual void Importing(ImportContentContext context, TPart instance) { } + protected virtual void Imported(ImportContentContext context, TPart instance) { } + protected virtual void Exporting(ExportContentContext context, TPart instance) { } + protected virtual void Exported(ExportContentContext context, TPart instance) { } protected virtual void Restoring(RestoreContentContext context, TPart instance) { } protected virtual void Restored(RestoreContentContext context, TPart instance) { } protected virtual void Destroying(DestroyContentContext context, TPart instance) { } @@ -121,6 +125,26 @@ namespace Orchard.ContentManagement.Handlers { Indexed(context, context.ContentItem.As()); } + void IContentStorageFilter.Importing(ImportContentContext context) { + if (context.ContentItem.Is()) + Importing(context, context.ContentItem.As()); + } + + void IContentStorageFilter.Imported(ImportContentContext context) { + if (context.ContentItem.Is()) + Imported(context, context.ContentItem.As()); + } + + void IContentStorageFilter.Exporting(ExportContentContext context) { + if (context.ContentItem.Is()) + Exporting(context, context.ContentItem.As()); + } + + void IContentStorageFilter.Exported(ExportContentContext context) { + if (context.ContentItem.Is()) + Exported(context, context.ContentItem.As()); + } + void IContentStorageFilter.Restoring(RestoreContentContext context) { if (context.ContentItem.Is()) Restoring(context, context.ContentItem.As()); diff --git a/src/Orchard/Data/SessionLocator.cs b/src/Orchard/Data/SessionLocator.cs index 5224a5b9e..6e1219928 100644 --- a/src/Orchard/Data/SessionLocator.cs +++ b/src/Orchard/Data/SessionLocator.cs @@ -74,6 +74,7 @@ namespace Orchard.Data { if (_session != null && _session.Transaction.IsActive) { Logger.Debug("Rolling back transaction"); _session.Transaction.Rollback(); + DisposeSession(); } } diff --git a/src/Orchard/Environment/DefaultOrchardHost.cs b/src/Orchard/Environment/DefaultOrchardHost.cs index a1e70d003..6bd9076a8 100644 --- a/src/Orchard/Environment/DefaultOrchardHost.cs +++ b/src/Orchard/Environment/DefaultOrchardHost.cs @@ -143,6 +143,10 @@ namespace Orchard.Environment { catch (Exception e) { Logger.Error(e, "A tenant could not be started: " + settings.Name); } + while (_processingEngine.AreTasksPending()) { + Logger.Debug("Processing pending task after activate Shell"); + _processingEngine.ExecuteNextTask(); + } }); } // no settings, run the Setup diff --git a/src/Orchard/Mvc/Html/ContentItemExtensions.cs b/src/Orchard/Mvc/Html/ContentItemExtensions.cs index c8caa9a03..11807448c 100644 --- a/src/Orchard/Mvc/Html/ContentItemExtensions.cs +++ b/src/Orchard/Mvc/Html/ContentItemExtensions.cs @@ -114,6 +114,18 @@ namespace Orchard.Mvc.Html { new RouteValueDictionary(htmlAttributes)); } + public static MvcHtmlString ItemEditLink(this HtmlHelper html, string linkText, IContent content, object additionalRouteValues, object htmlAttributes) { + var metadata = content.ContentItem.ContentManager.GetItemMetadata(content); + if (metadata.EditorRouteValues == null) + return null; + + return html.ActionLink( + NonNullOrEmpty(linkText, metadata.DisplayText, content.ContentItem.TypeDefinition.DisplayName), + Convert.ToString(metadata.EditorRouteValues["action"]), + metadata.EditorRouteValues.Merge(additionalRouteValues), + htmlAttributes); + } + public static MvcHtmlString ItemAdminLink(this HtmlHelper html, IContent content) { return ItemAdminLink(html, null, content); } diff --git a/src/Orchard/Mvc/MvcModule.cs b/src/Orchard/Mvc/MvcModule.cs index 08d46530e..5b0c3bbf4 100644 --- a/src/Orchard/Mvc/MvcModule.cs +++ b/src/Orchard/Mvc/MvcModule.cs @@ -53,6 +53,12 @@ namespace Orchard.Mvc { // thus preventing a StackOverflowException. var baseUrl = new Func(() => siteService.GetSiteSettings().BaseUrl); var httpContextBase = context.Resolve().Current(); + + if (httpContextBase == null) { + context.Resolve().CreateWorkContextScope(); + return context.Resolve().Current(); + } + context.Resolve().CreateWorkContextScope(httpContextBase); return httpContextBase; } @@ -192,6 +198,18 @@ namespace Orchard.Mvc { } } + public override string HttpMethod { + get { + return ""; + } + } + + public override NameValueCollection Params { + get { + return new NameValueCollection(); + } + } + public override string AppRelativeCurrentExecutionFilePath { get { return "~/"; @@ -240,6 +258,12 @@ namespace Orchard.Mvc { } } + public override string[] UserLanguages { + get { + return new string[0]; + } + } + public override HttpBrowserCapabilitiesBase Browser { get { return new HttpBrowserCapabilitiesPlaceholder();