From 30a95ed773ca8c391ad37622c7e5132d22bc36d9 Mon Sep 17 00:00:00 2001 From: yw80 Date: Fri, 17 Jul 2015 17:58:18 +0800 Subject: [PATCH 01/25] Correct CSS class name of MediaLibraryPickerField field Field CSS class name should use the technical name, rather than the display name. --- .../Views/Fields/MediaLibraryPicker.Summary.cshtml | 3 ++- .../Views/Fields/MediaLibraryPicker.SummaryAdmin.cshtml | 3 ++- .../Views/Fields/MediaLibraryPicker.cshtml | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) 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..5b4f5fd80 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 @@ -5,11 +5,12 @@ @{ var field = (MediaLibraryPickerField) Model.ContentField; string name = field.DisplayName; + string techName = field.Name; var mediaParts = field.MediaParts; } @if (mediaParts.Any()) { @name: -

+

@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..d5d267795 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 @@ -5,12 +5,13 @@ @{ var field = (MediaLibraryPickerField) Model.ContentField; string name = field.DisplayName; + string techName = field.Name; var mediaParts = field.MediaParts; var returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString(); } @name: -

+

@if (mediaParts.Any()) { foreach (var contentItem in mediaParts) { 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..bf6374a58 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Fields/MediaLibraryPicker.cshtml +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Fields/MediaLibraryPicker.cshtml @@ -5,9 +5,10 @@ @{ var field = (MediaLibraryPickerField) Model.ContentField; string name = field.DisplayName; + string techName = field.Name; var contents = field.MediaParts; } -

+

@name

@foreach(var content in contents) {
From 70ea2df33413fba59cca2a20abe64246ad1672c9 Mon Sep 17 00:00:00 2001 From: jtkech Date: Mon, 20 Jul 2015 02:11:49 +0200 Subject: [PATCH 02/25] Update ContentItem.cs --- src/Orchard/ContentManagement/ContentItem.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 +} From 28643ae7b885850e69f247d1a76f2f2a096cf1bf Mon Sep 17 00:00:00 2001 From: jtkech Date: Mon, 20 Jul 2015 02:23:56 +0200 Subject: [PATCH 03/25] Update ContentPart.cs --- src/Orchard/ContentManagement/ContentPart.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; From a0f42632e0cda20c623cb1fa94b9eb1efb8f8ae3 Mon Sep 17 00:00:00 2001 From: yw80 Date: Mon, 20 Jul 2015 15:43:23 +0800 Subject: [PATCH 04/25] Remove the blank line at the bottom of every page after the default theme rendering. Set a background color to #layout-footer In Site.css, you can clearly see the blank line at the bottom. --- src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css | 2 ++ 1 file changed, 2 insertions(+) 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; } From e8111cef5e159bf479c0e2e6dbfb99b37db6825c Mon Sep 17 00:00:00 2001 From: jtkech Date: Fri, 24 Jul 2015 02:54:01 +0200 Subject: [PATCH 05/25] Update DynamicContentItemTests.cs Adds an unit test for null checking on dynamic ContentItem / ContentPart properties --- .../DynamicContentItemTests.cs | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) 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)); + } } } From 879e35dcc03d2a0cb84c865a7f8d33a88f868cfc Mon Sep 17 00:00:00 2001 From: yw80 Date: Fri, 24 Jul 2015 12:21:31 +0800 Subject: [PATCH 06/25] Correct CSS class name of MediaLibraryPickerField field Field CSS class name should use the technical name, rather than the display name. --- .../Views/Fields/MediaLibraryPicker.Summary.cshtml | 8 ++++---- .../Views/Fields/MediaLibraryPicker.SummaryAdmin.cshtml | 8 ++++---- .../Views/Fields/MediaLibraryPicker.cshtml | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) 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 5b4f5fd80..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,13 +4,13 @@ @{ var field = (MediaLibraryPickerField) Model.ContentField; - string name = field.DisplayName; - string techName = field.Name; + 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 d5d267795..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,14 +4,14 @@ @{ var field = (MediaLibraryPickerField) Model.ContentField; - string name = field.DisplayName; - string techName = field.Name; + string displayName = field.DisplayName; + string name = field.Name; var mediaParts = field.MediaParts; var returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString(); } -@name: -

+@displayName: +

@if (mediaParts.Any()) { foreach (var contentItem in mediaParts) { 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 bf6374a58..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,12 +4,12 @@ @{ var field = (MediaLibraryPickerField) Model.ContentField; - string name = field.DisplayName; - string techName = field.Name; + string displayName = field.DisplayName; + string name = field.Name; var contents = field.MediaParts; } -

-

@name

+
+

@displayName

@foreach(var content in contents) {
@Display(BuildDisplay(content, "Summary")) From 8a8b0f91c63c07f40f2bc364e0c0a9bf64abf554 Mon Sep 17 00:00:00 2001 From: Sergio Navarro Date: Sat, 25 Jul 2015 08:54:31 +0200 Subject: [PATCH 07/25] Fixed #5140 Recipe from Migrations didn't work --- src/Orchard/Environment/DefaultOrchardHost.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Orchard/Environment/DefaultOrchardHost.cs b/src/Orchard/Environment/DefaultOrchardHost.cs index 2e10d25d2..977515317 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 From cc70480126a226628c95ad5bd9833bd8372c519d Mon Sep 17 00:00:00 2001 From: Thierry Fleury Date: Mon, 10 Aug 2015 15:28:19 +0200 Subject: [PATCH 08/25] Fixes 5591 : ContentType's name encoding --- src/Orchard.Web/Core/Contents/Views/Admin/Create.cshtml | 3 +-- src/Orchard.Web/Core/Contents/Views/Admin/List.cshtml | 6 +++--- .../Modules/Orchard.ContentTypes/Views/Admin/Edit.cshtml | 2 +- .../Orchard.ContentTypes/Views/Admin/EditField.cshtml | 2 +- .../Views/DisplayTemplates/EditTypeViewModel.cshtml | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) 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 e091e129f..8b4f6bc8e 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) { From fd931397a4443a7f3d227af84242dd8a6e276b58 Mon Sep 17 00:00:00 2001 From: mvarblow Date: Thu, 13 Aug 2015 12:01:35 -0400 Subject: [PATCH 09/25] Allow for packing a debug build We use the orchard packaging script for continuous deployments to QA servers where we'd like to run debug builds. --- Orchard.proj | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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 @@ From d9a3db1ebf27fa559f58b45612697058d60110c5 Mon Sep 17 00:00:00 2001 From: qt1 Date: Fri, 21 Aug 2015 03:09:50 +0300 Subject: [PATCH 10/25] Support htmlAttributes in ItemEditLink --- src/Orchard/Mvc/Html/ContentItemExtensions.cs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/Orchard/Mvc/Html/ContentItemExtensions.cs b/src/Orchard/Mvc/Html/ContentItemExtensions.cs index 8524091c7..c5f4b2e7e 100644 --- a/src/Orchard/Mvc/Html/ContentItemExtensions.cs +++ b/src/Orchard/Mvc/Html/ContentItemExtensions.cs @@ -101,6 +101,18 @@ namespace Orchard.Mvc.Html { metadata.EditorRouteValues.Merge(additionalRouteValues)); } + 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); } From 9e95f961959e74d8cbbd4092a235736139e62dca Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Fri, 21 Aug 2015 15:59:12 -0700 Subject: [PATCH 11/25] Supporting `..` syntax in watched assets --- src/Gulpfile.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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); } From 28a1b4d663db301d6880f52bb087e26db5f0aa99 Mon Sep 17 00:00:00 2001 From: Jack Cheng Date: Fri, 21 Aug 2015 19:27:29 -0700 Subject: [PATCH 12/25] #5618 taxonomy in autoroute needs to be saved twice Fixes 5618 --- .../Drivers/TaxonomyFieldDriver.cs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TaxonomyFieldDriver.cs b/src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TaxonomyFieldDriver.cs index 81fa93e10..96e76cf6f 100644 --- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TaxonomyFieldDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TaxonomyFieldDriver.cs @@ -60,7 +60,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() @@ -84,7 +84,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)) { @@ -158,6 +160,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 { From 21875b98cca959e8f3dbd226b178f0b969a44938 Mon Sep 17 00:00:00 2001 From: Thierry Fleury Date: Mon, 24 Aug 2015 11:28:16 +0200 Subject: [PATCH 13/25] Fixes #5475 : Add missing properties to HttpRequestPlaceholder --- src/Orchard/Mvc/MvcModule.cs | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/Orchard/Mvc/MvcModule.cs b/src/Orchard/Mvc/MvcModule.cs index f2ac24f56..a10474b24 100644 --- a/src/Orchard/Mvc/MvcModule.cs +++ b/src/Orchard/Mvc/MvcModule.cs @@ -188,6 +188,18 @@ namespace Orchard.Mvc { } } + public override string HttpMethod { + get { + return ""; + } + } + + public override NameValueCollection Params { + get { + return new NameValueCollection(); + } + } + public override string AppRelativeCurrentExecutionFilePath { get { return "~/"; @@ -236,6 +248,12 @@ namespace Orchard.Mvc { } } + public override string[] UserLanguages { + get { + return new string[0]; + } + } + public override HttpBrowserCapabilitiesBase Browser { get { return new HttpBrowserCapabilitiesPlaceholder(); From 47d3d2b73859d8fab95b81fd80803f8685d8ea06 Mon Sep 17 00:00:00 2001 From: Gustavo Tandeciarz Date: Tue, 25 Aug 2015 12:54:26 -0400 Subject: [PATCH 14/25] Fixes #5693 Will not disable the admin theme. --- .../Orchard.Themes/Drivers/DisableThemePartDriver.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Drivers/DisableThemePartDriver.cs b/src/Orchard.Web/Modules/Orchard.Themes/Drivers/DisableThemePartDriver.cs index ec9330e9f..f726b36de 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/Drivers/DisableThemePartDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Themes/Drivers/DisableThemePartDriver.cs @@ -1,7 +1,8 @@ -using System.Web; +using System.Web; using JetBrains.Annotations; using Orchard.ContentManagement.Drivers; using Orchard.Themes.Models; +using Orchard.UI.Admin; namespace Orchard.Themes.Drivers { [UsedImplicitly] @@ -13,6 +14,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; @@ -20,4 +24,4 @@ namespace Orchard.Themes.Drivers { } } -} \ No newline at end of file +} From c80f2d4baa05b6815ba09431849019a24643711f Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Mon, 24 Aug 2015 12:03:49 -0700 Subject: [PATCH 15/25] Fixing Search settings export --- .../Orchard.Search/Drivers/SearchSettingsPartDriver.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Search/Drivers/SearchSettingsPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Search/Drivers/SearchSettingsPartDriver.cs index cf5b0c8fc..8fe72d8d8 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; @@ -61,7 +62,10 @@ namespace Orchard.Search.Drivers { } protected override void Exporting(SearchSettingsPart part, ExportContentContext context) { - context.Element(part.PartDefinition.Name).Add(new XAttribute("SearchFields", part.Retrieve("SearchFields"))); + var searchFields = part.Retrieve("SearchFields"); + if(!String.IsNullOrWhiteSpace(searchFields)) { + context.Element(part.PartDefinition.Name).Add(new XAttribute("SearchFields", searchFields)); + } } protected override void Importing(SearchSettingsPart part, ImportContentContext context) { From d35ebe04e7240fc145b22690cfe37ab15740e83e Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Tue, 25 Aug 2015 13:15:31 -0700 Subject: [PATCH 16/25] Adding User identity resolver To improve import step for Users --- .../Orchard.Users/Orchard.Users.csproj | 1 + .../Services/UserNameIdentityResolver.cs | 37 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 src/Orchard.Web/Modules/Orchard.Users/Services/UserNameIdentityResolver.cs diff --git a/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj b/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj index c7bcf942c..7ed8d86b2 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj +++ b/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj @@ -101,6 +101,7 @@ + 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 From dcc7783f12089a604d99c99e4fbec14ba3c45907 Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Tue, 25 Aug 2015 18:34:13 -0700 Subject: [PATCH 17/25] Adding storage filter events for Import/Export --- .../Handlers/ContentHandler.cs | 47 ++++++++++++++++++- .../Handlers/IContentStorageFilter.cs | 4 ++ .../Handlers/StorageFilterBase.cs | 24 ++++++++++ 3 files changed, 73 insertions(+), 2 deletions(-) diff --git a/src/Orchard/ContentManagement/Handlers/ContentHandler.cs b/src/Orchard/ContentManagement/Handlers/ContentHandler.cs index f52f25fca..5170b368b 100644 --- a/src/Orchard/ContentManagement/Handlers/ContentHandler.cs +++ b/src/Orchard/ContentManagement/Handlers/ContentHandler.cs @@ -96,6 +96,21 @@ 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 OnGetContentItemMetadata(Action handler) where TPart : class, IContent { Filters.Add(new InlineTemplateFilter { OnGetItemMetadata = handler }); @@ -132,6 +147,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 +207,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 +388,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()); From e6424e2589898e4adf5e6ae0e2f470534405f9db Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Wed, 26 Aug 2015 14:38:33 -0700 Subject: [PATCH 18/25] Removing empty folder --- .../Modules/Orchard.ImportExport/Orchard.ImportExport.csproj | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj b/src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj index e7987bd59..d6dbf1cac 100644 --- a/src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj +++ b/src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj @@ -25,6 +25,7 @@ + true @@ -106,9 +107,7 @@ - - - + From 8d4cb98d592b4bd58bc89b0b72e567eaf0022c75 Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Wed, 26 Aug 2015 14:40:20 -0700 Subject: [PATCH 19/25] Adding missing content handler Restore events --- src/Orchard/ContentManagement/Handlers/ContentHandler.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/Orchard/ContentManagement/Handlers/ContentHandler.cs b/src/Orchard/ContentManagement/Handlers/ContentHandler.cs index 5170b368b..fe53ebbaa 100644 --- a/src/Orchard/ContentManagement/Handlers/ContentHandler.cs +++ b/src/Orchard/ContentManagement/Handlers/ContentHandler.cs @@ -112,6 +112,14 @@ namespace Orchard.ContentManagement.Handlers { 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 }); } From 4cec35daf8c72cafdb71e36ec95b79731f0a74e0 Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Wed, 26 Aug 2015 14:41:12 -0700 Subject: [PATCH 20/25] Disposing the session when a transaction is rolled back --- src/Orchard/Data/SessionLocator.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Orchard/Data/SessionLocator.cs b/src/Orchard/Data/SessionLocator.cs index 5224a5b9e..73785702e 100644 --- a/src/Orchard/Data/SessionLocator.cs +++ b/src/Orchard/Data/SessionLocator.cs @@ -30,9 +30,9 @@ namespace Orchard.Data { } public class TransactionManager : ITransactionManager, IDisposable { - private readonly ISessionFactoryHolder _sessionFactoryHolder; private readonly IEnumerable _interceptors; private Func _contentManagerSessionFactory; + private readonly ISessionFactory _sessionFactory; private ISession _session; private IContentManagerSession _contentManagerSession; @@ -41,9 +41,9 @@ namespace Orchard.Data { ISessionFactoryHolder sessionFactoryHolder, Func contentManagerSessionFactory, IEnumerable interceptors) { - _sessionFactoryHolder = sessionFactoryHolder; _interceptors = interceptors; _contentManagerSessionFactory = contentManagerSessionFactory; + _sessionFactory = sessionFactoryHolder.GetSessionFactory(); Logger = NullLogger.Instance; IsolationLevel = IsolationLevel.ReadCommitted; @@ -74,6 +74,7 @@ namespace Orchard.Data { if (_session != null && _session.Transaction.IsActive) { Logger.Debug("Rolling back transaction"); _session.Transaction.Rollback(); + DisposeSession(); } } @@ -106,10 +107,9 @@ namespace Orchard.Data { if (_session != null) { return; } - - var sessionFactory = _sessionFactoryHolder.GetSessionFactory(); + Logger.Debug("Opening NHibernate session"); - _session = sessionFactory.OpenSession(new OrchardSessionInterceptor(_interceptors.ToArray(), Logger)); + _session = _sessionFactory.OpenSession(new OrchardSessionInterceptor(_interceptors.ToArray(), Logger)); _session.BeginTransaction(level); _contentManagerSession = _contentManagerSessionFactory(); } From 79a0ae86e8372ed7f218850eb8973ccbf90905e9 Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Wed, 26 Aug 2015 14:42:18 -0700 Subject: [PATCH 21/25] Create index command should not delete existing index --- .../Orchard.Indexing/Commands/IndexingCommands.cs | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) 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.")); + } + } } } From 6810cf473f251e1a5f80d82342f2a1a9f5f60327 Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Wed, 26 Aug 2015 14:42:43 -0700 Subject: [PATCH 22/25] Updating indexing tasks when content is imported or restored --- .../Handlers/CreateIndexingTaskHandler.cs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) 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); } } From 7f91e787de8519d5502443b5f4eb5ccc7940258d Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Wed, 26 Aug 2015 14:43:06 -0700 Subject: [PATCH 23/25] Adding debug log when content item is imported --- .../Orchard.Recipes/RecipeHandlers/DataRecipeHandler.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/RecipeHandlers/DataRecipeHandler.cs b/src/Orchard.Web/Modules/Orchard.Recipes/RecipeHandlers/DataRecipeHandler.cs index c7cca8fd8..c2e29bf49 100644 --- a/src/Orchard.Web/Modules/Orchard.Recipes/RecipeHandlers/DataRecipeHandler.cs +++ b/src/Orchard.Web/Modules/Orchard.Recipes/RecipeHandlers/DataRecipeHandler.cs @@ -39,6 +39,7 @@ namespace Orchard.Recipes.RecipeHandlers { //Populate import session with all identities to be imported foreach (var identity in elementDictionary.Keys) { + Logger.Debug("Importing {0}", identity); importContentSession.Set(identity, elementDictionary[identity].Name.LocalName); } @@ -86,7 +87,7 @@ namespace Orchard.Recipes.RecipeHandlers { var elementDictionary = new Dictionary(); foreach (var element in step.Elements()) { if (element.Attribute("Id") == null - || string.IsNullOrEmpty(element.Attribute("Id").Value)) + || String.IsNullOrWhiteSpace(element.Attribute("Id").Value)) continue; var identity = new ContentIdentity(element.Attribute("Id").Value).ToString(); From 96f6cb36fde9c4e68252a2f56bf26d329b1335bc Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Wed, 26 Aug 2015 16:40:02 -0700 Subject: [PATCH 24/25] Reverting session factory changes --- src/Orchard/Data/SessionLocator.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Orchard/Data/SessionLocator.cs b/src/Orchard/Data/SessionLocator.cs index 73785702e..6e1219928 100644 --- a/src/Orchard/Data/SessionLocator.cs +++ b/src/Orchard/Data/SessionLocator.cs @@ -30,9 +30,9 @@ namespace Orchard.Data { } public class TransactionManager : ITransactionManager, IDisposable { + private readonly ISessionFactoryHolder _sessionFactoryHolder; private readonly IEnumerable _interceptors; private Func _contentManagerSessionFactory; - private readonly ISessionFactory _sessionFactory; private ISession _session; private IContentManagerSession _contentManagerSession; @@ -41,9 +41,9 @@ namespace Orchard.Data { ISessionFactoryHolder sessionFactoryHolder, Func contentManagerSessionFactory, IEnumerable interceptors) { + _sessionFactoryHolder = sessionFactoryHolder; _interceptors = interceptors; _contentManagerSessionFactory = contentManagerSessionFactory; - _sessionFactory = sessionFactoryHolder.GetSessionFactory(); Logger = NullLogger.Instance; IsolationLevel = IsolationLevel.ReadCommitted; @@ -107,9 +107,10 @@ namespace Orchard.Data { if (_session != null) { return; } - + + var sessionFactory = _sessionFactoryHolder.GetSessionFactory(); Logger.Debug("Opening NHibernate session"); - _session = _sessionFactory.OpenSession(new OrchardSessionInterceptor(_interceptors.ToArray(), Logger)); + _session = sessionFactory.OpenSession(new OrchardSessionInterceptor(_interceptors.ToArray(), Logger)); _session.BeginTransaction(level); _contentManagerSession = _contentManagerSessionFactory(); } From 4b595690130e9fb472f42d1dbfad6c6e4a3042dd Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Wed, 26 Aug 2015 17:17:49 -0700 Subject: [PATCH 25/25] #5490 Fixing HttpRequestBase DependenciesShouldBeUpgradedFirst Fixes #5490 --- src/Orchard/Mvc/MvcModule.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Orchard/Mvc/MvcModule.cs b/src/Orchard/Mvc/MvcModule.cs index a10474b24..0bcd1c9a5 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; }