lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-09-23 04:43:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

#17365: 404 error when changing Permalink

Browse Source 
Work Items: 17365

--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2011-04-04 17:02:03 -07:00
parent 083cb58830
commit 73a3bd5ebc
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,11 +12,13 @@ using Orchard.Core.Common.Models;
using Orchard.Core.Containers.Models; using Orchard.Core.Containers.Models;
using Orchard.Core.Contents.Settings; using Orchard.Core.Contents.Settings;
using Orchard.Core.Contents.ViewModels; using Orchard.Core.Contents.ViewModels;
using Orchard.Core.Routable.Models;
using Orchard.Data; using Orchard.Data;
using Orchard.DisplayManagement; using Orchard.DisplayManagement;
using Orchard.Localization; using Orchard.Localization;
using Orchard.Logging; using Orchard.Logging;
using Orchard.Mvc.Extensions; using Orchard.Mvc.Extensions;
using Orchard.Mvc.Html;
using Orchard.UI.Navigation; using Orchard.UI.Navigation;
using Orchard.UI.Notify; using Orchard.UI.Notify;
using Orchard.Settings; using Orchard.Settings;
@@ -295,6 +297,17 @@ namespace Orchard.Core.Contents.Controllers {
if (!Services.Authorizer.Authorize(Permissions.EditContent, contentItem, T("Couldn't edit content"))) if (!Services.Authorizer.Authorize(Permissions.EditContent, contentItem, T("Couldn't edit content")))
return new HttpUnauthorizedResult(); return new HttpUnauthorizedResult();
// store the previous route in case a back redirection is requested
string previousRoute = null;
var route = contentItem.As<RoutePart>();
if(route != null
&&!string.IsNullOrWhiteSpace(returnUrl)
&& Url.IsLocalUrl(returnUrl)
&& returnUrl == Url.ItemDisplayUrl(contentItem) // only if the original returnUrl is the content itself
) {
previousRoute = route.Path;
}
dynamic model = _contentManager.UpdateEditor(contentItem, this); dynamic model = _contentManager.UpdateEditor(contentItem, this);
if (!ModelState.IsValid) { if (!ModelState.IsValid) {
_transactionManager.Cancel(); _transactionManager.Cancel();
@@ -304,6 +317,13 @@ namespace Orchard.Core.Contents.Controllers {
conditionallyPublish(contentItem); conditionallyPublish(contentItem);
// did the route change ?
if (!string.IsNullOrWhiteSpace(returnUrl)
&& previousRoute != null
&& contentItem.As<RoutePart>().Path != previousRoute) {
returnUrl = Url.ItemDisplayUrl(contentItem);
}
Services.Notifier.Information(string.IsNullOrWhiteSpace(contentItem.TypeDefinition.DisplayName) Services.Notifier.Information(string.IsNullOrWhiteSpace(contentItem.TypeDefinition.DisplayName)
? T("Your content has been saved.") ? T("Your content has been saved.")
: T("Your {0} has been saved.", contentItem.TypeDefinition.DisplayName)); : T("Your {0} has been saved.", contentItem.TypeDefinition.DisplayName));