Skip to content

Commit 830cad1

Browse files
committed
Add audit trail to Rule
1 parent 288e49a commit 830cad1

File tree

5 files changed

+18
-6
lines changed

5 files changed

+18
-6
lines changed

src/ZKEACMS.WebHost/Locale/zh-CN.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1546,4 +1546,5 @@ Deleted: 已删除
15461546
Change History: 变更历史
15471547
Old Value: 旧值
15481548
New Value: 新值
1549-
Selected: 已选择
1549+
Selected: 已选择
1550+
RuleExpression: 规则表达式

src/ZKEACMS.WebHost/Locale/zh-TW.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1547,4 +1547,5 @@ Deleted: 已删除
15471547
Change History: 變更歷史
15481548
Old Value: 舊值
15491549
New Value: 新值
1550-
Selected: 已選擇
1550+
Selected: 已選擇
1551+
RuleExpression: 規則表達式

src/ZKEACMS.WebHost/Views/Rule/Edit.cshtml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<input type="submit" class="btn btn-primary" value="@L("Save And Exit")" data-value="@(ActionType.UpdateAndExit)" />
1919
<input type="submit" value="@L("Delete")" class="btn btn-danger delete" data-value="@ActionType.Delete" />
2020
}
21+
@Html.ChangeHistoryBtn(Model)
2122
<a class="btn btn-default" href="@Url.Action("Index")">@L("Cancel")</a>
2223
</div>
2324
}

src/ZKEACMS/Rule/Rule.cs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
using System.ComponentModel.DataAnnotations.Schema;
1212
using System.Text;
1313
using Easy.Extend;
14+
using Easy.AuditTrail.Attributes;
1415

1516
namespace ZKEACMS.Rule
1617
{
@@ -25,14 +26,17 @@ public Rule()
2526
}
2627
[Key]
2728
public int RuleID { get; set; }
29+
2830
public string ZoneName { get; set; }
2931
public string RuleExpression { get; set; }
32+
33+
[AuditIgnore]
3034
public string RuleItems { get; set; }
31-
[NotMapped]
32-
public List<RuleItem> RuleItemList { get; set; }
3335

36+
[NotMapped, AuditIgnore]
37+
public List<RuleItem> RuleItemList { get; set; }
3438

35-
[NotMapped]
39+
[NotMapped, AuditIgnore]
3640
public HashSet<string> ZoneNames
3741
{
3842
get

src/ZKEACMS/Rule/RuleService.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
using ZKEACMS.Widget;
1515
using Easy.RuleEngine;
1616
using Easy.Serializer;
17+
using Easy.AuditTrail;
1718

1819
namespace ZKEACMS.Rule
1920
{
@@ -23,17 +24,20 @@ public class RuleService : ServiceBase<Rule, CMSDbContext>, IRuleService
2324
private readonly IWidgetActivator _widgetActivator;
2425
private readonly IRuleManager _ruleManager;
2526
private readonly ILocalize _localize;
27+
private readonly IAuditTrailService _auditTrailService;
2628
public RuleService(IApplicationContext applicationContext,
2729
IWidgetBasePartService widgetBasePartService,
2830
IWidgetActivator widgetActivator, IRuleManager
2931
ruleManager, CMSDbContext dbContext,
30-
ILocalize localize)
32+
ILocalize localize,
33+
IAuditTrailService auditTrailService)
3134
: base(applicationContext, dbContext)
3235
{
3336
_widgetBasePartService = widgetBasePartService;
3437
_widgetActivator = widgetActivator;
3538
_ruleManager = ruleManager;
3639
_localize = localize;
40+
_auditTrailService = auditTrailService;
3741
}
3842
private Rule Init(Rule item)
3943
{
@@ -98,6 +102,7 @@ public override ErrorOr<Rule> Update(Rule item)
98102
{
99103
return new Error("Title", _localize.Get("There is an error value in the condition, save failed!"));
100104
}
105+
_auditTrailService.AuditUpdate(Get(item.RuleID), item);
101106
return base.Update(item);
102107
}
103108
public override Rule Get(params object[] primaryKey)

0 commit comments

Comments
 (0)