lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Work on Routable parts edition

Browse Source 
--HG--
branch : theming
This commit is contained in:
Sebastien Ros
2010-09-13 12:02:50 -07:00
parent 91862c6672
commit a37b464a14
10 changed files with 27 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -211,7 +211,7 @@ namespace Orchard.Core.Contents.Controllers {
return new HttpUnauthorizedResult();
var model = _contentManager.BuildEditorModel(contentItem);
return View(Shape.Model(Content: model));
return View(model);
}
@@ -227,13 +227,13 @@ namespace Orchard.Core.Contents.Controllers {
if (!ModelState.IsValid) {
_transactionManager.Cancel();
return View(Shape.Model(Content: model));
return View(model);
}
if (!contentItem.Has<IPublishingControlAspect>())
_contentManager.Publish(contentItem);
Services.Notifier.Information(string.IsNullOrWhiteSpace(model.TypeDefinition.DisplayName)
Services.Notifier.Information(string.IsNullOrWhiteSpace(contentItem.TypeDefinition.DisplayName)
? T("Your content has been created.")
: T("Your {0} has been created.", contentItem.TypeDefinition.DisplayName));
return RedirectToAction("Edit", new RouteValueDictionary { { "Id", contentItem.Id } });
@@ -250,7 +250,7 @@ namespace Orchard.Core.Contents.Controllers {
var model = _contentManager.BuildEditorModel(contentItem);
return View(Shape.Model(Content: model));
return View(model);
}
[HttpPost, ActionName("Edit")]
@@ -266,14 +266,14 @@ namespace Orchard.Core.Contents.Controllers {
var model = _contentManager.UpdateEditorModel(contentItem, this);
if (!ModelState.IsValid) {
_transactionManager.Cancel();
return View("Edit", Shape.Model(Content: model));
return View("Edit", model);
}
//need to go about this differently - to know when to publish (IPlublishableAspect ?)
if (!contentItem.Has<IPublishingControlAspect>())
_contentManager.Publish(contentItem);
Services.Notifier.Information(string.IsNullOrWhiteSpace(model.TypeDefinition.DisplayName)
Services.Notifier.Information(string.IsNullOrWhiteSpace(contentItem.TypeDefinition.DisplayName)
? T("Your content has been saved.")
: T("Your {0} has been saved.", contentItem.TypeDefinition.DisplayName));
return RedirectToAction("Edit", new RouteValueDictionary { { "Id", contentItem.Id } });