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

#18335: Fixing validation messages

Browse Source 
Work Item: 18335

--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2012-01-13 16:11:22 -08:00
parent 3907ab4de6
commit 664bfe0550
7 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,12 +73,20 @@ namespace Orchard.Roles.Controllers {
return new HttpUnauthorizedResult();
var viewModel = new RoleCreateViewModel();
UpdateModel(viewModel);
TryUpdateModel(viewModel);
//check if the role name already exists
if (!_roleService.VerifyRoleUnicity(viewModel.Name)) {
Services.Notifier.Error(T("Creating Role {0} failed: Role with same name already exists", viewModel.Name));
return RedirectToAction("Create");
if(String.IsNullOrEmpty(viewModel.Name)) {
ModelState.AddModelError("Name", T("Role name can't be empty"));
}
var role = _roleService.GetRoleByName(viewModel.Name);
if (role != null) {
ModelState.AddModelError("Name", T("Role with same name already exists"));
}
if (!ModelState.IsValid) {
viewModel.FeaturePermissions = _roleService.GetInstalledPermissions();
return View(viewModel);
}
_roleService.CreateRole(viewModel.Name);
@@ -123,7 +131,21 @@ namespace Orchard.Roles.Controllers {
return new HttpUnauthorizedResult();
var viewModel = new RoleEditViewModel();
UpdateModel(viewModel);
TryUpdateModel(viewModel);
if (String.IsNullOrEmpty(viewModel.Name)) {
ModelState.AddModelError("Name", T("Role name can't be empty"));
}
var role = _roleService.GetRoleByName(viewModel.Name);
if (role != null && role.Id != id) {
ModelState.AddModelError("Name", T("Role with same name already exists"));
}
if (!ModelState.IsValid) {
return Edit(id);
}
// Save
List<string> rolePermissions = new List<string>();
foreach (string key in Request.Form.Keys) {