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 bug #16531 - There is a 404 error when click "Remove" button on the "Edit Role" page(Build 2143

Browse Source 
--HG--
branch : dev
This commit is contained in:
Andre Rodrigues
2010-10-14 17:18:21 -07:00
parent bc10445c0b
commit 87b174107e
3 changed files with 49 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/Orchard.Web/Modules/Orchard.Roles/Controllers/AdminController.cs
View File

@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Web; using System.Web;
using System.Web.Mvc; using System.Web.Mvc;
using Orchard.Core.Contents.Controllers;
using Orchard.Localization; using Orchard.Localization;
using Orchard.Roles.Models; using Orchard.Roles.Models;
using Orchard.Roles.Services; using Orchard.Roles.Services;
@@ -98,9 +99,9 @@ namespace Orchard.Roles.Controllers {
var role = _roleService.GetRole(id); var role = _roleService.GetRole(id);
if (role == null) { if (role == null) {
//TODO: Error message return HttpNotFound();
throw new HttpException(404, "page with id " + id + " was not found");
} }
var model = new RoleEditViewModel { Name = role.Name, Id = role.Id, var model = new RoleEditViewModel { Name = role.Name, Id = role.Id,
RoleCategoryPermissions = _roleService.GetInstalledPermissions(), RoleCategoryPermissions = _roleService.GetInstalledPermissions(),
CurrentPermissions = _roleService.GetPermissionsForRole(id)}; CurrentPermissions = _roleService.GetPermissionsForRole(id)};
@@ -117,7 +118,8 @@ namespace Orchard.Roles.Controllers {
} }
[HttpPost, ActionName("Edit")] [HttpPost, ActionName("Edit")]
public ActionResult EditPOST() { [FormValueRequired("submit.Save")]
public ActionResult EditSavePOST(int id) {
if (!Services.Authorizer.Authorize(Permissions.ManageRoles, T("Not authorized to manage roles"))) if (!Services.Authorizer.Authorize(Permissions.ManageRoles, T("Not authorized to manage roles")))
return new HttpUnauthorizedResult(); return new HttpUnauthorizedResult();
@@ -125,24 +127,38 @@ namespace Orchard.Roles.Controllers {
try { try {
UpdateModel(viewModel); UpdateModel(viewModel);
// Save // Save
if (!String.IsNullOrEmpty(HttpContext.Request.Form["submit.Save"])) { List<string> rolePermissions = new List<string>();
List<string> rolePermissions = new List<string>(); foreach (string key in Request.Form.Keys) {
foreach (string key in Request.Form.Keys) { if (key.StartsWith("Checkbox.") && Request.Form[key] == "true") {
if (key.StartsWith("Checkbox.") && Request.Form[key] == "true") { string permissionName = key.Substring("Checkbox.".Length);
string permissionName = key.Substring("Checkbox.".Length); rolePermissions.Add(permissionName);
rolePermissions.Add(permissionName);
}
} }
_roleService.UpdateRole(viewModel.Id, viewModel.Name, rolePermissions);
} }
else if (!String.IsNullOrEmpty(HttpContext.Request.Form["submit.Delete"])) { _roleService.UpdateRole(viewModel.Id, viewModel.Name, rolePermissions);
_roleService.DeleteRole(viewModel.Id);
} Services.Notifier.Information(T("Your Role has been saved."));
return RedirectToAction("Edit", new { viewModel.Id }); return RedirectToAction("Edit", new { id });
} }
catch (Exception exception) { catch (Exception exception) {
Services.Notifier.Error(T("Editing Role failed: {0}", exception.Message)); Services.Notifier.Error(T("Editing Role failed: {0}", exception.Message));
return RedirectToAction("Edit", viewModel.Id); return RedirectToAction("Edit", id);
}
}
[HttpPost, ActionName("Edit")]
[FormValueRequired("submit.Delete")]
public ActionResult EditDeletePOST(int id) {
if (!Services.Authorizer.Authorize(Permissions.ManageRoles, T("Not authorized to manage roles")))
return new HttpUnauthorizedResult();
try {
_roleService.DeleteRole(id);
Services.Notifier.Information(T("Role was successfully deleted."));
return RedirectToAction("Index");
} catch (Exception exception) {
Services.Notifier.Error(T("Editing Role failed: {0}", exception.Message));
return RedirectToAction("Edit", id);
} }
} }
} }

4
src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj
View File

@@ -103,6 +103,10 @@
<Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project> <Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
<Name>Orchard.Framework</Name> <Name>Orchard.Framework</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\Core\Orchard.Core.csproj">
<Project>{9916839C-39FC-4CEB-A5AF-89CA7E87119F}</Project>
<Name>Orchard.Core</Name>
</ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" /> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />

28
src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.cshtml
View File

@@ -9,24 +9,24 @@
<select id="Select1" name="roleActions"> <select id="Select1" name="roleActions">
<option value="1">@T("Remove")</option> <option value="1">@T("Remove")</option>
</select> </select>
<input class="button" type="submit" value="@T("Apply")" /> <input class="button" type="submit" value="@T("Apply")" />
</fieldset> </fieldset>
<div class="manage">@Html.ActionLink(T("Add a role").ToString(), "Create", new { }, new { @class = "button primaryAction" })</div> <div class="manage">@Html.ActionLink(T("Add a role").ToString(), "Create", new { }, new { @class = "button primaryAction" })</div>
<fieldset> <fieldset>
<table class="items" summary="@T("This is a table of the roles currently available for use in your application.")"> <table class="items" summary="@T("This is a table of the roles currently available for use in your application.")">
<colgroup> <colgroup>
<col id="Col1" /> <col id="Col1" />
<col id="Col2" /> <col id="Col2" />
<col id="Col3" /> <col id="Col3" />
</colgroup> </colgroup>
<thead> <thead>
<tr> <tr>
<th scope="col">&nbsp;&darr;</th> <th scope="col">&nbsp;&darr;</th>
<th scope="col">@T("Name")</th> <th scope="col">@T("Name")</th>
<th scope="col"></th> <th scope="col"></th>
</tr> </tr>
</thead> </thead>
@foreach (var row in Model.Rows) { @foreach (var row in Model.Rows) {
<tr> <tr>
<td><input type="checkbox" value="true" name="@("Checkbox." + row.Id)"/></td> <td><input type="checkbox" value="true" name="@("Checkbox." + row.Id)"/></td>
<td>@row.Name</td> <td>@row.Name</td>
@@ -34,7 +34,5 @@
</tr> </tr>
} }
</table> </table>
</fieldset> </fieldset>
} }