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

Making the SigninUserActivity support logging in the contextual content item if that content has the UserPart attached.

Browse Source
This commit is contained in:
Sipke Schoorstra
2014-11-28 20:26:22 -08:00
parent da72fc9809
commit 6b32f6db3c
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Orchard.Web/Modules/Orchard.Users/Activities/SignInUserActivity.cs
View File

@@ -1,9 +1,11 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Orchard.ContentManagement;
using Orchard.Environment.Extensions;
using Orchard.Localization;
using Orchard.Security;
using Orchard.Users.Models;
using Orchard.Workflows.Models;
using Orchard.Workflows.Services;
@@ -30,7 +32,7 @@ namespace Orchard.Users.Activities {
}
public override LocalizedString Description {
get { return T("Signs in a user based on the specified credentials."); }
get { return T("Signs in a user based on the specified credentials, or if the current content item us a user, that user is signed in."); }
}
public override string Form {
@@ -54,7 +56,9 @@ namespace Orchard.Users.Activities {
yield break;
}
var user = _membershipService.ValidateUser(userNameOrEmail, password);
var user = !String.IsNullOrWhiteSpace(userNameOrEmail)
? _membershipService.ValidateUser(userNameOrEmail, password)
: workflowContext.Content != null ? workflowContext.Content.As<UserPart>() : default(UserPart);
if (user == null) {
yield return T("IncorrectUserNameOrPassword");