Browse Source

rename auditing permission and feature names

pull/94/head
cKey 5 years ago
parent
commit
83e7218a61
  1. 14
      aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application.Contracts/LINGYUN/Abp/Auditing/Features/AuditingFeatureDefinitionProvider.cs
  2. 11
      aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application.Contracts/LINGYUN/Abp/Auditing/Features/AuditingFeatureNames.cs
  3. 2
      aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application/LINGYUN/Abp/Auditing/Logging/AuditLogAppService.cs
  4. 2
      aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application/LINGYUN/Abp/Auditing/Security/SecurityLogAppService.cs
  5. 4
      vueJs/src/views/admin/auditing/audit-log/index.vue
  6. 4
      vueJs/src/views/admin/auditing/security-log/index.vue

14
aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application.Contracts/LINGYUN/Abp/Auditing/Features/AuditingFeatureDefinitionProvider.cs

@ -13,15 +13,21 @@ namespace LINGYUN.Abp.Auditing.Features
name: AuditingFeatureNames.GroupName, name: AuditingFeatureNames.GroupName,
displayName: L("Features:Auditing")); displayName: L("Features:Auditing"));
auditingGroup.AddFeature( var loggingFeature = auditingGroup.AddFeature(
name: AuditingFeatureNames.AuditLog.Default, name: AuditingFeatureNames.Logging.Default,
displayName: L("Features:Auditing"),
description: L("Features:Auditing")
);
loggingFeature.CreateChild(
name: AuditingFeatureNames.Logging.AuditLog,
defaultValue: true.ToString(), defaultValue: true.ToString(),
displayName: L("Features:DisplayName:AuditLog"), displayName: L("Features:DisplayName:AuditLog"),
description: L("Features:Description:AuditLog"), description: L("Features:Description:AuditLog"),
valueType: new ToggleStringValueType(new BooleanValueValidator()) valueType: new ToggleStringValueType(new BooleanValueValidator())
); );
auditingGroup.AddFeature( loggingFeature.CreateChild(
name: AuditingFeatureNames.SecurityLog.Default, name: AuditingFeatureNames.Logging.SecurityLog,
defaultValue: true.ToString(), defaultValue: true.ToString(),
displayName: L("Features:DisplayName:SecurityLog"), displayName: L("Features:DisplayName:SecurityLog"),
description: L("Features:Description:SecurityLog"), description: L("Features:Description:SecurityLog"),

11
aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application.Contracts/LINGYUN/Abp/Auditing/Features/AuditingFeatureNames.cs

@ -3,14 +3,13 @@
public static class AuditingFeatureNames public static class AuditingFeatureNames
{ {
public const string GroupName = "AbpAuditing"; public const string GroupName = "AbpAuditing";
public class AuditLog public class Logging
{ {
public const string Default = GroupName + ".AuditLog"; public const string Default = GroupName + ".Logging";
}
public class SecurityLog public const string AuditLog = Default + ".AuditLog";
{
public const string Default = GroupName + ".SecurityLog"; public const string SecurityLog = Default + ".SecurityLog";
} }
} }
} }

2
aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application/LINGYUN/Abp/Auditing/Logging/AuditLogAppService.cs

@ -12,7 +12,7 @@ using Volo.Abp.Features;
namespace LINGYUN.Abp.Auditing.Logging namespace LINGYUN.Abp.Auditing.Logging
{ {
[Authorize(AuditingPermissionNames.AuditLog.Default)] [Authorize(AuditingPermissionNames.AuditLog.Default)]
[RequiresFeature(AuditingFeatureNames.AuditLog.Default)] [RequiresFeature(AuditingFeatureNames.Logging.AuditLog)]
public class AuditLogAppService : AuditingApplicationServiceBase, IAuditLogAppService public class AuditLogAppService : AuditingApplicationServiceBase, IAuditLogAppService
{ {
protected IAuditLogRepository AuditLogRepository { get; } protected IAuditLogRepository AuditLogRepository { get; }

2
aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application/LINGYUN/Abp/Auditing/Security/SecurityLogAppService.cs

@ -11,7 +11,7 @@ using Volo.Abp.Identity;
namespace LINGYUN.Abp.Auditing.Security namespace LINGYUN.Abp.Auditing.Security
{ {
[Authorize(AuditingPermissionNames.SecurityLog.Default)] [Authorize(AuditingPermissionNames.SecurityLog.Default)]
[RequiresFeature(AuditingFeatureNames.SecurityLog.Default)] [RequiresFeature(AuditingFeatureNames.Logging.SecurityLog)]
public class SecurityLogAppService : AuditingApplicationServiceBase, ISecurityLogAppService public class SecurityLogAppService : AuditingApplicationServiceBase, ISecurityLogAppService
{ {
protected IIdentitySecurityLogRepository SecurityLogRepository { get; } protected IIdentitySecurityLogRepository SecurityLogRepository { get; }

4
vueJs/src/views/admin/auditing/audit-log/index.vue

@ -239,7 +239,7 @@
> >
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-button <el-button
:disabled="!checkPermission(['Abp.Auditing.AuditLog'])" :disabled="!checkPermission(['AbpAuditing.AuditLog'])"
size="mini" size="mini"
type="primary" type="primary"
@click="handleShowAuditLogDialog(row)" @click="handleShowAuditLogDialog(row)"
@ -247,7 +247,7 @@
查看日志 查看日志
</el-button> </el-button>
<el-button <el-button
:disabled="!checkPermission(['Abp.Auditing.AuditLog.Delete'])" :disabled="!checkPermission(['AbpAuditing.AuditLog.Delete'])"
size="mini" size="mini"
type="danger" type="danger"
@click="handleDeleteAuditLog(row.id)" @click="handleDeleteAuditLog(row.id)"

4
vueJs/src/views/admin/auditing/security-log/index.vue

@ -200,7 +200,7 @@
> >
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-button <el-button
:disabled="!checkPermission(['Abp.Auditing.SecurityLog'])" :disabled="!checkPermission(['AbpAuditing.SecurityLog'])"
size="mini" size="mini"
type="primary" type="primary"
@click="handleShowSecurityLogDialog(row)" @click="handleShowSecurityLogDialog(row)"
@ -208,7 +208,7 @@
查看日志 查看日志
</el-button> </el-button>
<el-button <el-button
:disabled="!checkPermission(['Abp.Auditing.SecurityLog.Delete'])" :disabled="!checkPermission(['AbpAuditing.SecurityLog.Delete'])"
size="mini" size="mini"
type="danger" type="danger"
@click="handleDeleteSecurityLog(row.id)" @click="handleDeleteSecurityLog(row.id)"

Loading…
Cancel
Save