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

Fixing General Settings update

Browse Source 
--HG--
branch : dev
This commit is contained in:
Sebastien Ros
2011-03-16 13:56:15 -07:00
parent ad16d00a8d
commit c4a2de09b6
1 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/Orchard.Web/Core/Settings/Controllers/AdminController.cs
View File

@@ -64,22 +64,27 @@ namespace Orchard.Core.Settings.Controllers {
var site = _siteService.GetSiteSettings();
dynamic model = Services.ContentManager.UpdateEditor(site, this, groupInfoId);
if (model == null) {
Services.TransactionManager.Cancel();
return HttpNotFound();
}
if (!string.IsNullOrWhiteSpace(groupInfoId)) {
if (model == null) {
Services.TransactionManager.Cancel();
return HttpNotFound();
}
var groupInfo = Services.ContentManager.GetEditorGroupInfo(site, groupInfoId);
if (groupInfo == null) {
Services.TransactionManager.Cancel();
return HttpNotFound();
}
var groupInfo = Services.ContentManager.GetEditorGroupInfo(site, groupInfoId);
if (groupInfo == null) {
Services.TransactionManager.Cancel();
return HttpNotFound();
}
if (!ModelState.IsValid) {
Services.TransactionManager.Cancel();
model.GroupInfo = groupInfo;
// Casting to avoid invalid (under medium trust) reflection over the protected View method and force a static invocation.
if (!ModelState.IsValid) {
Services.TransactionManager.Cancel();
model.GroupInfo = groupInfo;
// Casting to avoid invalid (under medium trust) reflection over the protected View method and force a static invocation.
return View((object) model);
}
}
else {
return View((object)model);
}