Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

Admin panel - remove option install permissions

KrzysztofPajak9674bfe527cf
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Permission/Index.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Permission/Index.cshtml
index 84ab65315..81ba04fd2 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Permission/Index.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Permission/Index.cshtml
@@ -15,7 +15,6 @@
</div>
<div class="actions">
<button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>
- <button class="btn btn-success" type="submit" name="save-continue"><i class="fa fa-check-circle"></i> @Loc["Admin.Configuration.Permissions.InstallMissingPermisions"] </button>
</div>
<vc:admin-widget widget-zone="permission_list_buttons" additional-data="null" />
</div>
diff --git a/src/Web/Grand.Web.Admin/Controllers/PermissionController.cs b/src/Web/Grand.Web.Admin/Controllers/PermissionController.cs
index c508d2bda..bb1b8a0ab 100644
--- a/src/Web/Grand.Web.Admin/Controllers/PermissionController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/PermissionController.cs
@@ -63,10 +63,9 @@ namespace Grand.Web.Admin.Controllers
var permissionRecords = await _permissionService.GetAllPermissions();
var customerGroups = await _groupService.GetAllCustomerGroups(showHidden: true);
- foreach (var pr in permissionRecords.OrderBy(x=>x.Category))
+ foreach (var pr in permissionRecords.OrderBy(x => x.Category))
{
- model.AvailablePermissions.Add(new PermissionRecordModel
- {
+ model.AvailablePermissions.Add(new PermissionRecordModel {
Name = pr.GetTranslationPermissionName(_translationService, _workContext),
SystemName = pr.SystemName,
Area = pr.Area,
@@ -90,57 +89,47 @@ namespace Grand.Web.Admin.Controllers
return View(model);
}
- [HttpPost, ActionName("Index"), ArgumentNameFilter(KeyName = "save-continue", Argument = "install")]
- public async Task<IActionResult> PermissionsSave(IFormCollection form, bool install)
+ [HttpPost, ActionName("Index")]
+ public async Task<IActionResult> PermissionsSave(IFormCollection form)
{
- if (!install)
- {
- var permissionRecords = await _permissionService.GetAllPermissions();
- var customerGroups = await _groupService.GetAllCustomerGroups(showHidden: true);
+ var permissionRecords = await _permissionService.GetAllPermissions();
+ var customerGroups = await _groupService.GetAllCustomerGroups(showHidden: true);
- foreach (var cr in customerGroups)
+ foreach (var cr in customerGroups)
+ {
+ string formKey = "allow_" + cr.Id;
+ var permissionRecordSystemNamesToRestrict = form[formKey].ToString() != null ? form[formKey].ToString().Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList() : new List<string>();
+ foreach (var pr in permissionRecords)
{
- string formKey = "allow_" + cr.Id;
- var permissionRecordSystemNamesToRestrict = form[formKey].ToString() != null ? form[formKey].ToString().Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList() : new List<string>();
- foreach (var pr in permissionRecords)
+
+ bool allow = permissionRecordSystemNamesToRestrict.Contains(pr.SystemName);
+ if (allow)
{
- bool allow = permissionRecordSystemNamesToRestrict.Contains(pr.SystemName);
- if (allow)
+ if (pr.CustomerGroups.FirstOrDefault(x => x == cr.Id) == null)
{
-
- if (pr.CustomerGroups.FirstOrDefault(x => x == cr.Id) == null)
- {
- pr.CustomerGroups.Add(cr.Id);
- await _permissionService.UpdatePermission(pr);
- }
+ pr.CustomerGroups.Add(cr.Id);
+ await _permissionService.UpdatePermission(pr);
}
- else
+ }
+ else
+ {
+ if (pr.CustomerGroups.FirstOrDefault(x => x == cr.Id) != null)
{
- if (pr.CustomerGroups.FirstOrDefault(x => x == cr.Id) != null)
- {
- pr.CustomerGroups.Remove(cr.Id);
- await _permissionService.UpdatePermission(pr);
- }
+ pr.CustomerGroups.Remove(cr.Id);
+ await _permissionService.UpdatePermission(pr);
}
}
}
- Success(_translationService.GetResource("Admin.Configuration.Permissions.Updated"));
}
- else
- {
- IPermissionProvider provider = new PermissionProvider();
- await _mediator.Send(new InstallNewPermissionsCommand() { PermissionProvider = provider });
+ Success(_translationService.GetResource("Admin.Configuration.Permissions.Updated"));
- Success(_translationService.GetResource("Admin.Configuration.Permissions.Installed"));
- }
return RedirectToAction("Index");
}
public async Task<IActionResult> PermissionsAction(string systemName, string customeGroupId)
{
- var model = new PermissionActionModel()
- {
+ var model = new PermissionActionModel() {
SystemName = systemName,
CustomerGroupId = customeGroupId,
};
@@ -194,8 +183,7 @@ namespace Grand.Web.Admin.Controllers
foreach (var item in insertActions)
{
- await _permissionService.InsertPermissionAction(new PermissionAction()
- {
+ await _permissionService.InsertPermissionAction(new PermissionAction() {
Action = item,
CustomerGroupId = customergroupId,
SystemName = systemname
diff --git a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml
index 4c094b41b..e1ed70cca 100644
--- a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml
+++ b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml
@@ -4770,9 +4770,6 @@
<Resource Name="Admin.Configuration.Permissions.Installed">
<Value>Missing permissions has been installed</Value>
</Resource>
- <Resource Name="Admin.Configuration.Permissions.InstallMissingPermisions">
- <Value>Install permissions</Value>
- </Resource>
<Resource Name="Admin.Configuration.Permissions.Permission">
<Value>Permission name</Value>
</Resource>