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

Correcting RolesPart display in User views

Browse Source 
--HG--
branch : dev
This commit is contained in:
Sebastien Ros
2010-10-05 14:45:12 -07:00
parent 3e93c19faa
commit 8ef28802a7
4 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Orchard.Web/Modules/Orchard.Roles/Views/EditorTemplates/Parts/Roles.UserRoles.cshtml
View File

@@ -1,5 +1,6 @@
@model UserRolesViewModel
@using Orchard.Roles.ViewModels
<fieldset>
<legend>@T("Roles")</legend>
@if (Model.Roles.Count > 0) {
@@ -8,14 +9,18 @@
if (string.Equals(entry.Name, "Authenticated", StringComparison.OrdinalIgnoreCase) || string.Equals(entry.Name, "Anonymous", StringComparison.OrdinalIgnoreCase)) {
continue;
}
Html.Hidden("Roles[" + index + "].RoleId", entry.RoleId);
Html.Hidden("Roles[" + index + "].Name", entry.Name);
@Html.Hidden("Roles[" + index + "].RoleId", entry.RoleId)
@Html.Hidden("Roles[" + index + "].Name", entry.Name)
<div>
@Html.CheckBox("Roles[" + index + "].Granted", entry.Granted)
<label class="forcheckbox" for="@"Roles[" + index + "]_Granted"">@entry.Name</label>
<label class="forcheckbox" for="@Html.FieldIdFor(m => m.Roles[index].Granted)">@entry.Name</label>
</div>
@++index;
index++;
}
}
else {<p>@T("There are no roles.")</p>}
else {
<p>@T("There are no roles.")</p>
}
</fieldset>

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

@@ -105,8 +105,10 @@ namespace Orchard.Users.Controllers {
if (!Services.Authorizer.Authorize(Permissions.ManageUsers, T("Not authorized to manage users")))
return new HttpUnauthorizedResult();
var user = Services.ContentManager.Get<UserPart>(id);
return View(new UserEditViewModel {
User = Services.ContentManager.Get<UserPart>(id)
User = Services.ContentManager.BuildEditorModel(user)
});
}
@@ -115,8 +117,9 @@ namespace Orchard.Users.Controllers {
if (!Services.Authorizer.Authorize(Permissions.ManageUsers, T("Not authorized to manage users")))
return new HttpUnauthorizedResult();
var user = Services.ContentManager.Get(id);
var model = new UserEditViewModel {
User = Services.ContentManager.Get<UserPart>(id)
User = Services.ContentManager.UpdateEditorModel(user, this)
};
TryUpdateModel(model);

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

@@ -28,6 +28,8 @@
@Html.ValidationMessageFor(m=>m.ConfirmPassword, "*")
</fieldset>
@Display(Model.User)
<fieldset>
<input class="button primaryAction" type="submit" value="@T("Add")" />
</fieldset>

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

@@ -16,6 +16,8 @@
@Html.ValidationMessageFor(m=>m.Email, "*")
</fieldset>
@Display(Model.User)
<fieldset>
<input class="button primaryAction" type="submit" value="@T("Save") " />
</fieldset>