Skip to content

Commit d0128b0

Browse files
committed
Add audit to article gallery and article type.
1 parent 3703321 commit d0128b0

File tree

7 files changed

+44
-3
lines changed

7 files changed

+44
-3
lines changed

src/Plugins/ZKEACMS.Article/Service/ArticleGalleryService.cs

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* http://www.zkea.net/licenses */
44

55
using Easy;
6+
using Easy.AuditTrail;
67
using Easy.RepositoryPattern;
78
using Microsoft.EntityFrameworkCore;
89
using System;
@@ -17,10 +18,15 @@ namespace ZKEACMS.Article.Service
1718
public class ArticleGalleryService : ServiceBase<ArticleGallery>, IArticleGalleryService
1819
{
1920
private readonly IArticleService _articleService;
20-
public ArticleGalleryService(IApplicationContext applicationContext, CMSDbContext dbContext, IArticleService articleService)
21+
private readonly IAuditTrailService _auditTrailService;
22+
public ArticleGalleryService(IApplicationContext applicationContext,
23+
CMSDbContext dbContext,
24+
IArticleService articleService,
25+
IAuditTrailService auditTrailService)
2126
: base(applicationContext, dbContext)
2227
{
2328
_articleService = articleService;
29+
_auditTrailService = auditTrailService;
2430
}
2531
public override ArticleGallery Get(params object[] primaryKey)
2632
{
@@ -39,5 +45,16 @@ public override ArticleGallery Get(params object[] primaryKey)
3945
}
4046
return gallery;
4147
}
48+
public override ErrorOr<ArticleGallery> Update(ArticleGallery item)
49+
{
50+
var oldItem = Get(item.ID);
51+
var result = base.Update(item);
52+
if (result.IsSuccess)
53+
{
54+
var newItem = Get(item.ID);
55+
_auditTrailService.AuditUpdate(oldItem, newItem);
56+
}
57+
return result;
58+
}
4259
}
4360
}

src/Plugins/ZKEACMS.Article/Service/ArticleTypeService.cs

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,25 @@
1111
using System;
1212
using System.Linq;
1313
using ZKEACMS.Common.Models;
14+
using Easy.AuditTrail;
1415

1516
namespace ZKEACMS.Article.Service
1617
{
1718
public class ArticleTypeService : ServiceBase<ArticleType, CMSDbContext>, IArticleTypeService
1819
{
1920
private readonly IArticleService _articleService;
2021
private readonly ILocalize _localize;
21-
public ArticleTypeService(IApplicationContext applicationContext, IArticleService articleService, ILocalize localize, CMSDbContext dbContext)
22+
private readonly IAuditTrailService _auditTrailService;
23+
public ArticleTypeService(IApplicationContext applicationContext,
24+
IArticleService articleService,
25+
ILocalize localize,
26+
CMSDbContext dbContext,
27+
IAuditTrailService auditTrailService)
2228
: base(applicationContext, dbContext)
2329
{
2430
_articleService = articleService;
2531
_localize = localize;
32+
_auditTrailService = auditTrailService;
2633
}
2734

2835
public override ErrorOr<ArticleType> Add(ArticleType item)
@@ -40,7 +47,13 @@ public override ErrorOr<ArticleType> Update(ArticleType item)
4047
{
4148
return new Error("Url", _localize.Get("URL already exists"));
4249
}
43-
return base.Update(item);
50+
var oldItem = Get(item.ID);
51+
var result = base.Update(item);
52+
if (result.IsSuccess)
53+
{
54+
_auditTrailService.AuditUpdate(oldItem, item);
55+
}
56+
return result;
4457
}
4558
public ArticleType GetByUrl(string url)
4659
{

src/Plugins/ZKEACMS.Article/Views/ArticleGallery/Edit.cshtml

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

src/Plugins/ZKEACMS.Article/Views/ArticleType/Edit.cshtml

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

src/ZKEACMS/Article/Models/ArticleGallery.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
* Copyright (c) ZKEASOFT. All rights reserved.
33
* http://www.zkea.net/licenses */
44

5+
using Easy.AuditTrail.Attributes;
56
using Easy.MetaData;
67
using Easy.Models;
78
using Easy.RepositoryPattern;
@@ -25,6 +26,8 @@ public ArticleGallery()
2526

2627
[NotMapped]
2728
public List<ArticleGalleryItem> Articles { get; set; }
29+
30+
[AuditIgnore]
2831
public string RawData
2932
{
3033
get { return JsonConverter.Serialize(Articles.RemoveDeletedItems()); }

src/ZKEACMS/Article/Models/ArticleGalleryItem.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* http://www.zkea.net/licenses */
44

55

6+
using Easy.AuditTrail.Attributes;
67
using Easy.MetaData;
78
using Easy.Models;
89
using System;
@@ -15,6 +16,7 @@ namespace ZKEACMS.Article.Models
1516
{
1617
public class ArticleGalleryItem : EditorEntity
1718
{
19+
[AuditKey, AuditTitle]
1820
public ArticleItem Article { get; set; }
1921
}
2022
class ArticleGalleryItemMetaData : ViewMetaData<ArticleGalleryItem>

src/ZKEACMS/Article/Models/ArticleItem.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* http://www.zkea.net/licenses */
44

55

6+
using Easy.AuditTrail.Attributes;
67
using Easy.MetaData;
78
using System;
89
using System.Collections.Generic;
@@ -14,7 +15,10 @@ namespace ZKEACMS.Article.Models
1415
{
1516
public class ArticleItem
1617
{
18+
[AuditTitle]
1719
public string Title { get; set; }
20+
21+
[AuditKey]
1822
public int ArticleID { get; set; }
1923
}
2024
class ArticleGalleryProductMetaData : ViewMetaData<ArticleItem>

0 commit comments

Comments
 (0)