diff --git a/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Projects/ProjectDto.cs b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Projects/ProjectDto.cs index b624a1f187..8996426406 100644 --- a/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Projects/ProjectDto.cs +++ b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Projects/ProjectDto.cs @@ -1,12 +1,12 @@ using System; using System.Collections.Generic; using Volo.Abp.Application.Dtos; -using Volo.Docs.Projects; +using Volo.Abp.Domain.Entities; namespace Volo.Docs.Admin.Projects { [Serializable] - public class ProjectDto : EntityDto + public class ProjectDto : EntityDto, IHasConcurrencyStamp { public string Name { get; set; } @@ -29,5 +29,7 @@ namespace Volo.Docs.Admin.Projects public string DocumentStoreType { get; set; } public Dictionary ExtraProperties { get; set; } + + public string ConcurrencyStamp { get; set; } } } diff --git a/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Projects/UpdateProjectDto.cs b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Projects/UpdateProjectDto.cs index f2d3c218c8..c1060e2e39 100644 --- a/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Projects/UpdateProjectDto.cs +++ b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Projects/UpdateProjectDto.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; -using Volo.Docs.Projects; +using Volo.Abp.Domain.Entities; namespace Volo.Docs.Admin.Projects { - public class UpdateProjectDto + public class UpdateProjectDto : IHasConcurrencyStamp { public string Name { get; set; } @@ -22,5 +22,7 @@ namespace Volo.Docs.Admin.Projects public string LatestVersionBranchName { get; set; } public Dictionary ExtraProperties { get; set; } + + public string ConcurrencyStamp { get; set; } } } diff --git a/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/Projects/ProjectAdminAppService.cs b/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/Projects/ProjectAdminAppService.cs index 24605f1cc8..7aeca0ac6a 100644 --- a/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/Projects/ProjectAdminAppService.cs +++ b/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/Projects/ProjectAdminAppService.cs @@ -4,6 +4,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; +using Volo.Abp.Data; using Volo.Abp.Guids; using Volo.Docs.Documents; using Volo.Docs.Documents.FullSearch.Elastic; @@ -96,6 +97,7 @@ namespace Volo.Docs.Admin.Projects project.SetFormat(input.Format); project.SetNavigationDocumentName(input.NavigationDocumentName); project.SetDefaultDocumentName(input.DefaultDocumentName); + project.SetConcurrencyStamp(input.ConcurrencyStamp); project.MinimumVersion = input.MinimumVersion; project.MainWebsiteUrl = input.MainWebsiteUrl; diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Edit.cshtml.cs b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Edit.cshtml.cs index ee27a2dc15..7f44ae396b 100644 --- a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Edit.cshtml.cs +++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Edit.cshtml.cs @@ -9,6 +9,7 @@ using Microsoft.AspNetCore.Mvc.Rendering; using Volo.Abp; using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form; using Volo.Abp.AspNetCore.Mvc.UI.RazorPages; +using Volo.Abp.Domain.Entities; using Volo.Abp.Validation; using Volo.Docs.Admin.Projects; using Volo.Docs.Projects; @@ -33,7 +34,7 @@ namespace Volo.Docs.Admin.Pages.Docs.Admin.Projects public virtual async Task OnGetAsync(Guid id) { var project = await _projectAppService.GetAsync(id); - + if (project.DocumentStoreType == "GitHub") { SetGithubProjectFromDto(project); @@ -89,7 +90,7 @@ namespace Volo.Docs.Admin.Pages.Docs.Admin.Projects } } - public abstract class EditProjectViewModelBase + public abstract class EditProjectViewModelBase : IHasConcurrencyStamp { [Required] [HiddenInput] @@ -119,6 +120,8 @@ namespace Volo.Docs.Admin.Pages.Docs.Admin.Projects [DynamicStringLength(typeof(ProjectConsts), nameof(ProjectConsts.MaxLatestVersionBranchNameLength))] public string LatestVersionBranchName { get; set; } + + public string ConcurrencyStamp { get; set; } } public class EditGithubProjectViewModel : EditProjectViewModelBase