Skip to content

Commit

Permalink
Further changes
Browse files Browse the repository at this point in the history
  • Loading branch information
support committed Dec 9, 2023
1 parent a152f3e commit 6e5e5c8
Show file tree
Hide file tree
Showing 24 changed files with 56 additions and 863 deletions.
2 changes: 0 additions & 2 deletions src/Business/Grand.Business.Common/Services/Security/PermissionProvider.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ public virtual IEnumerable<Permission> GetPermissions()
StandardPermission.ManageShippingSettings,
StandardPermission.ManageCurrencies,
StandardPermission.ManageMeasures,
StandardPermission.ManageActivityLog,
StandardPermission.ManageAcl,
StandardPermission.ManageEmailAccounts,
StandardPermission.ManageStores,
Expand Down Expand Up @@ -147,7 +146,6 @@ public virtual IEnumerable<DefaultPermission> GetDefaultPermissions()
StandardPermission.ManageShippingSettings,
StandardPermission.ManageCurrencies,
StandardPermission.ManageMeasures,
StandardPermission.ManageActivityLog,
StandardPermission.ManageAcl,
StandardPermission.ManageEmailAccounts,
StandardPermission.ManageStores,
Expand Down
8 changes: 0 additions & 8 deletions src/Business/Grand.Business.Core/Commands/System/Common/DeleteActivitylogCommand.cs
View file

This file was deleted.

1 change: 0 additions & 1 deletion src/Business/Grand.Business.Core/Utilities/Common/Security/PermissionSystemName.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ public static class PermissionSystemName
public const string ShippingSettings = "ManageShippingSettings";
public const string Currencies = "ManageCurrencies";
public const string Measures = "ManageMeasures";
public const string ActivityLog = "ManageActivityLog";
public const string Acl = "ManageACL";
public const string EmailAccounts = "ManageEmailAccounts";
public const string Stores = "ManageStores";
Expand Down
8 changes: 0 additions & 8 deletions ...Business/Grand.Business.Core/Utilities/Common/Security/StandardPermissionConfiguration.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,6 @@ public static partial class StandardPermission
PermissionActionName.Dimensions_List, PermissionActionName.Dimensions_Add, PermissionActionName.Dimensions_Edit, PermissionActionName.Dimensions_Delete
}
};
public static readonly Permission ManageActivityLog = new()
{
Name = "Manage Activity Log",
SystemName = PermissionSystemName.ActivityLog,
Area = "Admin area",
Category = CategoryConfiguration,
Actions = new List<string> { PermissionActionName.List, PermissionActionName.Edit, PermissionActionName.Delete }
};
public static readonly Permission ManageAcl = new()
{
Name = "Manage ACL",
Expand Down
37 changes: 5 additions & 32 deletions src/Business/Grand.Business.Core/Utilities/System/StandardAdminSiteMap.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ public static class StandardAdminSiteMap
new () {
SystemName = "Customers",
ResourceName = "Admin.Customers",
PermissionNames = new List<string> { PermissionSystemName.Customers, PermissionSystemName.Vendors, PermissionSystemName.VendorReviews, PermissionSystemName.ActivityLog,
PermissionNames = new List<string> { PermissionSystemName.Customers, PermissionSystemName.Vendors, PermissionSystemName.VendorReviews,
PermissionSystemName.CustomerTags, PermissionSystemName.CustomerGroups, PermissionSystemName.SalesEmployees },
IconClass = "icon-users",
DisplayOrder = 3,
Expand Down Expand Up @@ -296,15 +296,6 @@ public static class StandardAdminSiteMap
PermissionNames = new List<string> { PermissionSystemName.AddressAttributes },
DisplayOrder = 7,
IconClass = "fa fa-dot-circle-o"
},
new () {
SystemName = "Activity Log",
ResourceName = "Admin.Configuration.ActivityLog",
PermissionNames = new List<string> { PermissionSystemName.ActivityLog },
ControllerName = "ActivityLog",
ActionName = "ListLogs",
DisplayOrder = 8,
IconClass = "fa fa-arrow-circle-o-right"
}
}
},
Expand Down Expand Up @@ -562,7 +553,7 @@ public static class StandardAdminSiteMap
new () {
SystemName = "Reports",
ResourceName = "Admin.Reports",
PermissionNames = new List<string> { PermissionSystemName.Reports, PermissionSystemName.ActivityLog },
PermissionNames = new List<string> { PermissionSystemName.Reports },
IconClass = "icon-bar-chart",
DisplayOrder = 6,
ChildNodes = new List<AdminSiteMap> {
Expand Down Expand Up @@ -612,16 +603,7 @@ public static class StandardAdminSiteMap
ActionName = "Customer",
DisplayOrder = 4,
IconClass = "fa fa-dot-circle-o"
},
new () {
SystemName = "Activity Stats",
ResourceName = "Admin.Reports.ActivityLog.ActivityStats",
PermissionNames = new List<string> { PermissionSystemName.ActivityLog },
ControllerName = "ActivityLog",
ActionName = "ListStats",
DisplayOrder = 5,
IconClass = "fa fa-dot-circle-o"
}
}
}
},
new () {
Expand All @@ -630,7 +612,7 @@ public static class StandardAdminSiteMap
PermissionNames = new List<string> { PermissionSystemName.Countries, PermissionSystemName.Languages, PermissionSystemName.Settings,
PermissionSystemName.PaymentMethods, PermissionSystemName.ExternalAuthenticationMethods,
PermissionSystemName.TaxSettings, PermissionSystemName.ShippingSettings, PermissionSystemName.Currencies, PermissionSystemName.Measures,
PermissionSystemName.ActivityLog, PermissionSystemName.Acl, PermissionSystemName.EmailAccounts, PermissionSystemName.Plugins, PermissionSystemName.Widgets, PermissionSystemName.Stores, PermissionSystemName.Maintenance },
PermissionSystemName.Acl, PermissionSystemName.EmailAccounts, PermissionSystemName.Plugins, PermissionSystemName.Widgets, PermissionSystemName.Stores, PermissionSystemName.Maintenance },
IconClass = "icon-settings",
DisplayOrder = 7,
ChildNodes = new List<AdminSiteMap> {
Expand Down Expand Up @@ -902,7 +884,7 @@ public static class StandardAdminSiteMap
},
new () {
SystemName = "Settings",
PermissionNames = new List<string> { PermissionSystemName.Settings, PermissionSystemName.ActivityLog },
PermissionNames = new List<string> { PermissionSystemName.Settings },
ResourceName = "Admin.Settings",
IconClass = "icon-wrench",
DisplayOrder = 8,
Expand Down Expand Up @@ -986,15 +968,6 @@ public static class StandardAdminSiteMap
ActionName = "SystemSetting",
DisplayOrder = 9,
IconClass = "fa fa-dot-circle-o"
},
new () {
SystemName = "Activity Types",
ResourceName = "Admin.Settings.ActivityLog.ActivityLogType",
PermissionNames = new List<string> { PermissionSystemName.ActivityLog },
ControllerName = "ActivityLog",
ActionName = "ListTypes",
DisplayOrder = 10,
IconClass = "fa fa-dot-circle-o"
}
}
},
Expand Down
9 changes: 7 additions & 2 deletions src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationSystemPermission.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ public class MigrationSystemPermission : IMigration
{
public int Priority => 0;
public DbVersion Version => new(2, 2);
public Guid Identity => new("3F4E87C6-8ECE-4034-8211-39C3D3EBC567");
public string Name => "Install new permission - ManageAccessVendorPanel / Delete permission - ManageSystemLog";
public Guid Identity => new("8F35D0AF-28EF-4734-BC93-9F8A0F63E79A");
public string Name => "Install new permission - ManageAccessVendorPanel / Delete permission - ManageSystemLog/ManageActivityLog";

/// <summary>
/// Upgrade process
Expand Down Expand Up @@ -49,6 +49,11 @@ public bool UpgradeProcess(IDatabaseContext database, IServiceProvider servicePr
{
repository.Delete(permissionManageSystemLog);
}
var permissionManageActivityLog = repository.Table.FirstOrDefault(x => x.SystemName == "ManageActivityLog");
if (permissionManageActivityLog != null)
{
repository.Delete(permissionManageActivityLog);
}

}
catch (Exception ex)
Expand Down
56 changes: 44 additions & 12 deletions src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationUpdateAdminSiteMap.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class MigrationUpdateAdminSiteMap : IMigration
{
public int Priority => 0;
public DbVersion Version => new(2, 2);
public Guid Identity => new("55E49962-66DD-4034-8AB2-7F4C33A5E0B2");
public Guid Identity => new("D548BACF-3DF8-48ED-A522-086EAB165808");
public string Name => "Update standard admin site map - add admin menu";

/// <summary>
Expand All @@ -30,26 +30,58 @@ public bool UpgradeProcess(IDatabaseContext database, IServiceProvider servicePr
var sitemapConfiguration = repository.Table.FirstOrDefault(x => x.SystemName == "Configuration");
if (sitemapConfiguration != null)
{
sitemapConfiguration.ChildNodes.Add(new AdminSiteMap() {
SystemName = "Admin menu",
ResourceName = "Admin.Configuration.Menu",
PermissionNames = new List<string> { PermissionSystemName.Maintenance },
ControllerName = "Menu",
ActionName = "Index",
DisplayOrder = 7,
IconClass = "fa fa-dot-circle-o"
});
if (sitemapConfiguration.ChildNodes.FirstOrDefault(x => x.SystemName == "Admin menu") == null)
{
sitemapConfiguration.ChildNodes.Add(new AdminSiteMap() {
SystemName = "Admin menu",
ResourceName = "Admin.Configuration.Menu",
PermissionNames = new List<string> { PermissionSystemName.Maintenance },
ControllerName = "Menu",
ActionName = "Index",
DisplayOrder = 7,
IconClass = "fa fa-dot-circle-o"
});
}
sitemapConfiguration.PermissionNames.Remove("ManageActivityLog");
repository.Update(sitemapConfiguration);
}

var sitemapSystem = repository.Table.FirstOrDefault(x => x.SystemName == "System");
if (sitemapSystem != null)
var log = sitemapSystem?.ChildNodes.FirstOrDefault(x => x.SystemName == "Log");
if (log != null)
{
var log = sitemapSystem.ChildNodes.FirstOrDefault(x => x.SystemName == "Log");
sitemapSystem.ChildNodes.Remove(log);
sitemapSystem.PermissionNames.Remove("ManageSystemLog");
repository.Update(sitemapSystem);
}

var sitemapCustomers = repository.Table.FirstOrDefault(x => x.SystemName == "Customers");
var activityLog = sitemapCustomers?.ChildNodes.FirstOrDefault(x => x.SystemName == "Activity Log");
if (activityLog != null)
{
sitemapCustomers.ChildNodes.Remove(activityLog);
sitemapCustomers.PermissionNames.Remove("ManageActivityLog");
repository.Update(sitemapCustomers);
}

var sitemapReports = repository.Table.FirstOrDefault(x => x.SystemName == "Reports");
var activityStatLog = sitemapReports?.ChildNodes.FirstOrDefault(x => x.SystemName == "Activity Stats");
if (activityStatLog != null)
{
sitemapReports.ChildNodes.Remove(activityStatLog);
sitemapReports.PermissionNames.Remove("ManageActivityLog");
repository.Update(sitemapReports);
}

var sitemapSettings = repository.Table.FirstOrDefault(x => x.SystemName == "Settings");
var activityTypes = sitemapSettings?.ChildNodes.FirstOrDefault(x => x.SystemName == "Activity Types");
if (activityTypes != null)
{
sitemapSettings.ChildNodes.Remove(activityTypes);
sitemapSettings.PermissionNames.Remove("ManageActivityLog");
repository.Update(sitemapSettings);
}

}
catch (Exception ex)
{
Expand Down
67 changes: 0 additions & 67 deletions ...dmin/Areas/Admin/Views/Knowledgebase/Partials/CreateOrUpdateArticle.TabActivityLog.cshtml
View file

This file was deleted.

7 changes: 0 additions & 7 deletions ...Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/Partials/CreateOrUpdateArticle.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,6 @@
</div>
</content>
</tabstrip-item>
<tabstrip-item text="@Loc["Admin.Content.Knowledgebase.KnowledgebaseArticle.ActivityLog"]" tab-index="3">
<content>
<div>
<partial name="Partials/CreateOrUpdateArticle.TabActivityLog" model="Model" />
</div>
</content>
</tabstrip-item>
<vc:admin-widget widget-zone="knowledgebase_article_details_tabs" additional-data="Model" />
</items>
</admin-tabstrip>
67 changes: 0 additions & 67 deletions ...min/Areas/Admin/Views/Knowledgebase/Partials/CreateOrUpdateCategory.TabActivityLog.cshtml
View file

This file was deleted.

Loading

0 comments on commit 6e5e5c8

Please sign in to comment.