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

Handling unset owner as empty user name

Browse Source 
--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4043558
This commit is contained in:
loudej
2009-12-09 06:28:36 +00:00
parent e1e4d1bb41
commit 2639e38bae
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Orchard.Web/Core/Common/Providers/CommonAspectHandler.cs
View File

@@ -97,8 +97,11 @@ namespace Orchard.Core.Common.Providers {
if (!_authorizationService.CheckAccess(currentUser, Permissions.ChangeOwner)) { if (!_authorizationService.CheckAccess(currentUser, Permissions.ChangeOwner)) {
return; return;
} }
var viewModel = new OwnerEditorViewModel { Owner = instance.Owner.UserName }; var viewModel = new OwnerEditorViewModel();
context.AddEditor(new TemplateViewModel(viewModel, "CommonAspect") ); if (instance.Owner != null)
viewModel.Owner = instance.Owner.UserName;
context.AddEditor(new TemplateViewModel(viewModel, "CommonAspect"));
} }
@@ -112,10 +115,14 @@ namespace Orchard.Core.Common.Providers {
return; return;
} }
var viewModel = new OwnerEditorViewModel { Owner = instance.Owner.UserName }; var viewModel = new OwnerEditorViewModel ();
if (instance.Owner != null)
viewModel.Owner = instance.Owner.UserName;
var priorOwner = viewModel.Owner;
context.Updater.TryUpdateModel(viewModel, "CommonAspect", null, null); context.Updater.TryUpdateModel(viewModel, "CommonAspect", null, null);
if (viewModel.Owner != instance.Owner.UserName) { if (viewModel.Owner != priorOwner) {
var newOwner = _membershipService.GetUser(viewModel.Owner); var newOwner = _membershipService.GetUser(viewModel.Owner);
if (newOwner == null) { if (newOwner == null) {
context.Updater.AddModelError("CommonAspect.Owner", T("Invalid user name")); context.Updater.AddModelError("CommonAspect.Owner", T("Invalid user name"));