lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-12-17 18:01:19 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch '1.10.x' into dev

Browse Source
This commit is contained in:
Lombiq
2019-02-21 01:39:48 +01:00
committed by Benedek Farkas
parent 64c966af84 2ee16e1cb7
commit 48d24d7554
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Orchard.proj
View File

@@ -392,7 +392,7 @@
<Output TaskParameter="Lines" ItemName="ProfilingSetupCommands"/> <Output TaskParameter="Lines" ItemName="ProfilingSetupCommands"/>
</ReadLinesFromFile> </ReadLinesFromFile>
<Exec Command="$(ProfilingFolder)\bin\Orchard.exe %(ProfilingSetupCommands.Identity)" WorkingDirectory="$(ProfilingFolder)"/> <Exec Command="&quot;$(ProfilingFolder)\bin\Orchard.exe&quot; %(ProfilingSetupCommands.Identity)" WorkingDirectory="$(ProfilingFolder)"/>
</Target> </Target>
<!-- Gallery Packaging --> <!-- Gallery Packaging -->

2
src/Orchard.Profile/profiling-setup-commands.txt
View File

@@ -1 +1 @@
setup /SiteName:Profiling /AdminUsername:admin /AdminPassword:profiling-secret /DatabaseProvider:SQLServer /DatabaseConnectionString:"Data Source=.;Initial Catalog=Orchard;Integrated Security=True" /EnabledFeatures:Profiling,Orchard.Framework,Common,Containers,Contents,Dashboard,Feeds,Navigation,Scheduling,Settings,Shapes,Title,PackagingServices,Gallery,Orchard.PublishLater,Orchard.Blogs,Orchard.Comments,Orchard.ContentTypes,Orchard.Resources,Orchard.Lists,Orchard.MediaLibrary,Orchard.ContentPicker,Orchard.MediaPicker,Orchard.Modules,Orchard.Packaging,Orchard.Pages,Orchard.Recipes,Orchard.Roles,Orchard.Tags,Orchard.Themes,Orchard.Users,Orchard.Scripting,Orchard.Scripting.Lightweight,Orchard.Widgets,TinyMce,TheThemeMachine,Orchard.Tokens,Orchard.Alias,Orchard.Autoroute setup /SiteName:Profiling /AdminUsername:admin /AdminPassword:profiling-secret /DatabaseProvider:SQLServer /DatabaseConnectionString:"Data Source=.;Initial Catalog=Orchard;Integrated Security=True" /EnabledFeatures:Profiling,Orchard.Framework,Common,Containers,Contents,Dashboard,Feeds,Navigation,Scheduling,Settings,Shapes,Title,PackagingServices,Gallery,Orchard.PublishLater,Orchard.Blogs,Orchard.Comments,Orchard.ContentTypes,Orchard.Resources,Orchard.Lists,Orchard.MediaLibrary,Orchard.ContentPicker,Orchard.MediaPicker,Orchard.Modules,Orchard.Packaging,Orchard.Pages,Orchard.Recipes,Orchard.Roles,Orchard.Tags,Orchard.Themes,Orchard.Users,Orchard.Scripting,Orchard.Scripting.Lightweight,Orchard.Widgets,TinyMce,TheThemeMachine,Orchard.Tokens,Orchard.Alias,Orchard.Autoroute

10
src/Orchard.Web/Modules/Orchard.Pages/Commands/PageCommands.cs
View File

@@ -99,10 +99,6 @@ namespace Orchard.Pages.Commands {
} }
} }
if (Homepage) {
_homeAliasService.PublishHomeAlias(page);
}
var layout = default(string); var layout = default(string);
if (UseWelcomeText) { if (UseWelcomeText) {
var text = T( var text = T(
@@ -196,7 +192,7 @@ Aliquam vel sem nibh. Suspendisse vel condimentum tellus.</p>").Text;
} }
// (Layout) Hackish way to access the LayoutPart on the page without having to declare a dependency on Orchard.Layouts. // (Layout) Hackish way to access the LayoutPart on the page without having to declare a dependency on Orchard.Layouts.
var layoutPart = ((dynamic) page).LayoutPart; var layoutPart = ((dynamic)page).LayoutPart;
var bodyPart = page.As<BodyPart>(); var bodyPart = page.As<BodyPart>();
if (bodyPart != null) if (bodyPart != null)
@@ -209,6 +205,10 @@ Aliquam vel sem nibh. Suspendisse vel condimentum tellus.</p>").Text;
if (Publish) { if (Publish) {
_contentManager.Publish(page); _contentManager.Publish(page);
if (Homepage) {
_homeAliasService.PublishHomeAlias(page);
}
} }
Context.Output.WriteLine(T("Page created successfully.").Text); Context.Output.WriteLine(T("Page created successfully.").Text);