lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : dev
This commit is contained in:
Andre Rodrigues
2010-11-05 15:50:47 -07:00
parent b39862d608 26d34da16a
commit 054b0078d5
12 changed files with 109 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Orchard.Tests.Modules/Users/Controllers/AdminControllerTests.cs
View File

@@ -116,16 +116,17 @@ namespace Orchard.Tests.Modules.Users.Controllers {
[Test]
[Ignore("Needs to instead be a specflow test.")]
public void CreateShouldAddUserAndRedirect() {
_authorizer.Setup(x => x.Authorize(It.IsAny<Permission>(), It.IsAny<LocalizedString>())).Returns(true);
var controller = _container.Resolve<AdminController>();
var result = controller.CreatePOST(new UserCreateViewModel {
UserName = "four",
Email = "six@example.org",
Password = "five",
ConfirmPassword = "five"
});
ActionResult result = null; // controller.CreatePOST(new UserCreateViewModel {
// UserName = "four",
// Email = "six@example.org",
// Password = "five",
// ConfirmPassword = "five"
//});
Assert.That(result, Is.TypeOf<RedirectToRouteResult>());
var redirect = (RedirectToRouteResult)result;
@@ -136,7 +137,7 @@ namespace Orchard.Tests.Modules.Users.Controllers {
}
[Test]
[Ignore("Needs fixing")]
[Ignore("Needs fixing. Needs to instead be a specflow test.")]
public void EditShouldDisplayUserAndStoreChanges() {
_authorizer.Setup(x => x.Authorize(It.IsAny<Permission>(), It.IsAny<LocalizedString>())).Returns(true);
@@ -144,7 +145,7 @@ namespace Orchard.Tests.Modules.Users.Controllers {
var id = repository.Get(x => x.UserName == "two").Id;
var result = (ViewResult)_container.Resolve<AdminController>().Edit(id);
var model = (UserEditViewModel)result.ViewData.Model;
Assert.That(model.UserName, Is.EqualTo("two"));
//Assert.That(model.UserName, Is.EqualTo("two"));
var controller = _container.Resolve<AdminController>();
controller.ValueProvider = Values.From(new {

8
src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs
View File

@@ -125,6 +125,10 @@ namespace Orchard.Users.Controllers {
return RedirectToAction("ChallengeEmailSent");
}
if (user.As<UserPart>().RegistrationStatus == UserStatus.Pending) {
return RedirectToAction("RegistrationPending");
}
_authenticationService.SignIn(user, false /* createPersistentCookie */);
return Redirect("~/");
}
@@ -174,6 +178,10 @@ namespace Orchard.Users.Controllers {
}
}
public ActionResult RegistrationPending() {
return View();
}
public ActionResult ChangePasswordSuccess() {
return View();
}

73
src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs
View File

@@ -58,46 +58,52 @@ namespace Orchard.Users.Controllers {
return new HttpUnauthorizedResult();
var user = Services.ContentManager.New<IUser>("User");
var model = new UserCreateViewModel {
User = Services.ContentManager.BuildEditor(user)
};
var editor = Shape.EditorTemplate(TemplateName: "Parts/User.Create", Model: new UserCreateViewModel(), Prefix: null);
editor.Metadata.Position = "2";
var model = Services.ContentManager.BuildEditor(user);
model.Content.Add(editor);
return View(model);
}
[HttpPost, ActionName("Create")]
public ActionResult CreatePOST(UserCreateViewModel model) {
public ActionResult CreatePOST(UserCreateViewModel createModel) {
if (!Services.Authorizer.Authorize(Permissions.ManageUsers, T("Not authorized to manage users")))
return new HttpUnauthorizedResult();
var user = Services.ContentManager.New<IUser>("User");
model.User = Services.ContentManager.UpdateEditor(user, this);
if (!ModelState.IsValid) {
Services.TransactionManager.Cancel();
return View(model);
}
string userExistsMessage = _userService.VerifyUserUnicity(model.UserName, model.Email);
if (!string.IsNullOrEmpty(createModel.UserName)) {
string userExistsMessage = _userService.VerifyUserUnicity(createModel.UserName, createModel.Email);
if (userExistsMessage != null) {
AddModelError("NotUniqueUserName", T(userExistsMessage));
}
}
if (model.Password != model.ConfirmPassword) {
if (createModel.Password != createModel.ConfirmPassword) {
AddModelError("ConfirmPassword", T("Password confirmation must match"));
}
var user = Services.ContentManager.New<IUser>("User");
if (ModelState.IsValid) {
user = _membershipService.CreateUser(new CreateUserParams(
model.UserName,
model.Password,
model.Email,
createModel.UserName,
createModel.Password,
createModel.Email,
null, null, true));
}
model.User = Services.ContentManager.UpdateEditor(user, this);
var model = Services.ContentManager.UpdateEditor(user, this);
if (ModelState.IsValid == false) {
if (!ModelState.IsValid) {
Services.TransactionManager.Cancel();
var editor = Shape.EditorTemplate(TemplateName: "Parts/User.Create", Model: createModel, Prefix: null);
editor.Metadata.Position = "2";
model.Content.Add(editor);
return View(model);
}
Services.Notifier.Information(T("User created"));
return RedirectToAction("edit", new { user.Id });
}
@@ -106,10 +112,12 @@ namespace Orchard.Users.Controllers {
return new HttpUnauthorizedResult();
var user = Services.ContentManager.Get<UserPart>(id);
var editor = Shape.EditorTemplate(TemplateName: "Parts/User.Edit", Model: new UserEditViewModel {User = user}, Prefix: null);
editor.Metadata.Position = "2";
var model = Services.ContentManager.BuildEditor(user);
model.Content.Add(editor);
return View(new UserEditViewModel {
User = Services.ContentManager.BuildEditor(user)
});
return View(model);
}
[HttpPost, ActionName("Edit")]
@@ -118,26 +126,27 @@ namespace Orchard.Users.Controllers {
return new HttpUnauthorizedResult();
var user = Services.ContentManager.Get(id);
var model = new UserEditViewModel {
User = Services.ContentManager.UpdateEditor(user, this)
};
var model = Services.ContentManager.UpdateEditor(user, this);
TryUpdateModel(model);
var editModel = new UserEditViewModel {User = user};
TryUpdateModel(editModel);
if (!ModelState.IsValid) {
Services.TransactionManager.Cancel();
return View(model);
}
if (ModelState.IsValid) {
((IContent)model.ContentItem).As<UserPart>().NormalizedUserName = editModel.UserName.ToLower();
model.User.As<UserPart>().NormalizedUserName = model.UserName.ToLower();
string userExistsMessage = _userService.VerifyUserUnicity(id, model.UserName, model.Email);
string userExistsMessage = _userService.VerifyUserUnicity(id, editModel.UserName, editModel.Email);
if (userExistsMessage != null) {
AddModelError("NotUniqueUserName", T(userExistsMessage));
}
}
if (!ModelState.IsValid) {
Services.TransactionManager.Cancel();
var editor = Shape.EditorTemplate(TemplateName: "Parts/User.Edit", Model: editModel, Prefix: null);
editor.Metadata.Position = "2";
model.Content.Add(editor);
return View(model);
}

5
src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj
View File

@@ -127,6 +127,11 @@
<SubType>Designer</SubType>
</Content>
</ItemGroup>
<ItemGroup>
<Content Include="Views\Account\RegistrationPending.cshtml" />
<None Include="Views\EditorTemplates\Parts\User.Edit.cshtml" />
<None Include="Views\EditorTemplates\Parts\User.Create.cshtml" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

6
src/Orchard.Web/Modules/Orchard.Users/ViewModels/UserEditViewModel.cs
View File

@@ -1,15 +1,9 @@
using System.ComponentModel.DataAnnotations;
using System.Web.Mvc;
using Orchard.ContentManagement;
using Orchard.Users.Models;
namespace Orchard.Users.ViewModels {
public class UserEditViewModel {
[HiddenInput(DisplayValue = false)]
public int Id {
get { return User.ContentItem.Id; }
}
[Required]
public string UserName {
get { return User.As<UserPart>().Record.UserName; }

3
src/Orchard.Web/Modules/Orchard.Users/Views/Account/RegistrationPending.cshtml Normal file
View File

@@ -0,0 +1,3 @@
@model dynamic
<h1>@Html.TitleForPage(T("User Registration Pending").ToString()) </h1>
<p>@T("Your user account has been created but has to be approved before it can be used.")</p>

31
src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Create.cshtml
View File

@@ -1,32 +1,5 @@
@model Orchard.Users.ViewModels.UserCreateViewModel
<h1>@Html.TitleForPage(T("Add User").ToString()) </h1>
@using (Html.BeginFormAntiForgeryPost()) {
@Html.ValidationSummary()
<fieldset>
@Html.LabelFor(m => m.UserName, T("User Name"))
@Html.TextBoxFor(m=>m.UserName, new { @class = "textMedium" })
@Html.ValidationMessageFor(m=>m.UserName, "*")
</fieldset>
<fieldset>
@Html.LabelFor(m => m.Email, T("Email"))
@Html.TextBoxFor(m=>m.Email, new { @class = "textMedium" })
@Html.ValidationMessageFor(m=>m.Email, "*")
</fieldset>
<fieldset>
@Html.LabelFor(m => m.Password, T("Password"))
@Html.PasswordFor(m=>m.Password, new { @class = "textMedium" })
@Html.ValidationMessageFor(m=>m.Password, "*")
</fieldset>
<fieldset>
@Html.LabelFor(m => m.ConfirmPassword, T("Confirm Password"))
@Html.PasswordFor(m=>m.ConfirmPassword, new { @class = "textMedium" })
@Html.ValidationMessageFor(m=>m.ConfirmPassword, "*")
</fieldset>
@Display(Model.User)
}
@Display(Model)
}

17
src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Edit.cshtml
View File

@@ -1,20 +1,5 @@
@model Orchard.Users.ViewModels.UserEditViewModel
<h1>@Html.TitleForPage(T("Edit User").ToString()) </h1>
@using (Html.BeginFormAntiForgeryPost()) {
@Html.ValidationSummary()
@Html.EditorFor(m=>m.Id)
<fieldset>
@Html.LabelFor(m => m.UserName, T("User Name"))
@Html.TextBoxFor(m=>m.UserName, new { @class = "textMedium" })
@Html.ValidationMessageFor(m=>m.UserName, "*")
</fieldset>
<fieldset>
@Html.LabelFor(m => m.Email, T("Email"))
@Html.TextBoxFor(m=>m.Email, new { @class = "textMedium" })
@Html.ValidationMessageFor(m=>m.Email, "*")
</fieldset>
@Display(Model.User)
@Display(Model)
}

2
src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Index.cshtml
View File

@@ -28,7 +28,7 @@
else {
<img class="icon" src="@Href("~/Modules/Orchard.Users/Content/Admin/images/offline.gif") " alt="@T("Moderated") " title="@T("User is moderated") " />
}
@row.UserPart.UserName
@Html.ActionLink(row.UserPart.UserName, "Edit", new { row.UserPart.Id })
</td>
<td>
@row.UserPart.Email

21
src/Orchard.Web/Modules/Orchard.Users/Views/EditorTemplates/Parts/User.Create.cshtml Normal file
View File

@@ -0,0 +1,21 @@
@model Orchard.Users.ViewModels.UserCreateViewModel
<fieldset>
@Html.LabelFor(m => m.UserName, T("User Name"))
@Html.TextBoxFor(m=>m.UserName, new { @class = "textMedium" })
@Html.ValidationMessageFor(m=>m.UserName, "*")
</fieldset>
<fieldset>
@Html.LabelFor(m => m.Email, T("Email"))
@Html.TextBoxFor(m=>m.Email, new { @class = "textMedium" })
@Html.ValidationMessageFor(m=>m.Email, "*")
</fieldset>
<fieldset>
@Html.LabelFor(m => m.Password, T("Password"))
@Html.PasswordFor(m=>m.Password, new { @class = "textMedium" })
@Html.ValidationMessageFor(m=>m.Password, "*")
</fieldset>
<fieldset>
@Html.LabelFor(m => m.ConfirmPassword, T("Confirm Password"))
@Html.PasswordFor(m=>m.ConfirmPassword, new { @class = "textMedium" })
@Html.ValidationMessageFor(m=>m.ConfirmPassword, "*")
</fieldset>

11
src/Orchard.Web/Modules/Orchard.Users/Views/EditorTemplates/Parts/User.Edit.cshtml Normal file
View File

@@ -0,0 +1,11 @@
@model Orchard.Users.ViewModels.UserEditViewModel
<fieldset>
@Html.LabelFor(m => m.UserName, T("User Name"))
@Html.TextBoxFor(m=>m.UserName, new { @class = "textMedium" })
@Html.ValidationMessageFor(m=>m.UserName, "*")
</fieldset>
<fieldset>
@Html.LabelFor(m => m.Email, T("Email"))
@Html.TextBoxFor(m=>m.Email, new { @class = "textMedium" })
@Html.ValidationMessageFor(m=>m.Email, "*")
</fieldset>

2
src/Orchard.Web/Modules/Orchard.Users/Views/EditorTemplates/Parts/Users.RegistrationSettings.cshtml
View File

@@ -9,7 +9,7 @@
</div>
<div>
@Html.EditorFor(m => m.UsersMustValidateEmail)
<label class="forcheckbox" for="@Html.FieldIdFor( m => m.UsersMustValidateEmail)">@T("Users must justify their email address")</label>
<label class="forcheckbox" for="@Html.FieldIdFor( m => m.UsersMustValidateEmail)">@T("Users must verify their email address")</label>
@Html.ValidationMessage("UsersMustValidateEmail", "*")
</div>
<div>