Browse Source

fix config

pull/19919/head
Emre 2 years ago
parent
commit
0bee7341e7
  1. 2
      Directory.Packages.props
  2. 3
      modules/cms-kit/.gitignore
  3. 4
      modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo.CmsKit.Admin.Application.csproj
  4. 34
      modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Comments/CommentAdminAppService.cs
  5. 12
      modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Index.cshtml
  6. 2
      modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Index.cshtml.cs
  7. 1
      modules/cms-kit/src/Volo.CmsKit.Admin.Web/Volo.CmsKit.Admin.Web.csproj

2
Directory.Packages.props

@ -167,6 +167,8 @@
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="7.5.1" />
<PackageVersion Include="TimeZoneConverter" Version="6.1.0" />
<PackageVersion Include="Unidecode.NET" Version="2.1.0" />
<PackageVersion Include="Volo.Abp.SettingManagement.Domain" Version="8.1.3" />
<PackageVersion Include="Volo.Abp.SettingManagement.Web" Version="8.1.3" />
<PackageVersion Include="xunit" Version="2.6.1" />
<PackageVersion Include="xunit.extensibility.execution" Version="2.6.1" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.3" />

3
modules/cms-kit/.gitignore

@ -257,4 +257,5 @@ host/Volo.CmsKit.HttpApi.Host/Logs/logs.txt
host/Volo.CmsKit.Web.Host/Logs/logs.txt
host/Volo.CmsKit.Web.Unified/Logs/logs.txt
**/wwwroot/libs/**
**/wwwroot/libs/**

4
modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo.CmsKit.Admin.Application.csproj

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\..\common.props" />
<Import Project="..\..\..\..\configureawait.props" />
@ -11,6 +11,8 @@
<ItemGroup>
<ProjectReference Include="..\Volo.CmsKit.Admin.Application.Contracts\Volo.CmsKit.Admin.Application.Contracts.csproj" />
<ProjectReference Include="..\Volo.CmsKit.Common.Application\Volo.CmsKit.Common.Application.csproj" />
<ProjectReference Include="..\..\..\..\modules\setting-management\src\Volo.Abp.SettingManagement.Domain/Volo.Abp.SettingManagement.Domain.csproj" />
</ItemGroup>
<ItemGroup>

34
modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Comments/CommentAdminAppService.cs

@ -20,9 +20,11 @@ public class CommentAdminAppService : CmsKitAdminAppServiceBase, ICommentAdminAp
{
protected ICommentRepository CommentRepository { get; }
public CommentAdminAppService(ICommentRepository commentRepository)
private readonly ISettingManager SettingManager;
public CommentAdminAppService(ICommentRepository commentRepository, ISettingManager settingManager)
{
CommentRepository = commentRepository;
SettingManager = settingManager;
}
public virtual async Task<PagedResultDto<CommentWithAuthorDto>> GetListAsync(CommentGetListInput input)
@ -74,4 +76,34 @@ public class CommentAdminAppService : CmsKitAdminAppServiceBase, ICommentAdminAp
var comment = await CommentRepository.GetAsync(id);
await CommentRepository.DeleteWithRepliesAsync(comment);
}
[Authorize(CmsKitAdminPermissions.Comments.Update)]
public async Task UpdateApprovalStatusAsync(Guid id, CommentApprovalDto input)
{
var comment = await CommentRepository.GetAsync(id);
comment.SetApprovalStatus(input.IsApproved);
await CommentRepository.UpdateAsync(comment);
}
[Authorize(CmsKitAdminPermissions.Comments.Update)]
public async Task SetSettingsAsync(CommentSettingsDto input)
{
await SettingManager.SetGlobalAsync(AppSettings.CommentRequireApprovement, input.CommentRequireApprovement.ToString());
}
public async Task<CommentSettingsDto> GetSettingsAsync()
{
var isRequireApprovementEnabled = bool.Parse(await SettingManager.GetOrNullGlobalAsync(AppSettings.CommentRequireApprovement));
return new CommentSettingsDto
{
CommentRequireApprovement = isRequireApprovementEnabled
};
}
public async Task<int> GetWaitingCountAsync()
{
return (int) await CommentRepository.GetCountAsync(commentApproveState: CommentApproveState.Waiting);
}
}

12
modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Index.cshtml

@ -55,6 +55,18 @@
<abp-input asp-for="@Model.EntityType" label="@L["EntityType"].Value" type="text" />
</abp-column>
<abp-column size-lg="_2" size-md="_6">
<div class="mb-3" id="isApprovedColumn">
<label class="mb-1" for="isApprovedSelect">@L["CommentFilter:ApproveState"].Value</label>
<select id="isApprovedSelect" asp-for="@Model.CommentApproveState" class="form-control">
<option value="@CommentApproveState.All">@L["CommentFilter:All"].Value</option>
<option value="@CommentApproveState.Approved">@L["CommentFilter:Approved"].Value</option>
<option value="@CommentApproveState.Disapproved">@L["CommentFilter:Disapproved"].Value</option>
<option value="@CommentApproveState.Waiting">@L["CommentFilter:Waiting"].Value</option>
</select>
</div>
</abp-column>
<abp-column size-lg="_2" size-md="_6">
<abp-button class="w-100 mb-3" button-type="Primary" type="submit">
<i class="fa fa-search" aria-hidden="true"></i>

2
modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Index.cshtml.cs

@ -11,4 +11,6 @@ public class IndexModel : CmsKitAdminPageModel
public DateTime? CreationStartDate { get; set; }
public DateTime? CreationEndDate { get; set; }
public CommentApproveState CommentApproveState { get; set; }
}

1
modules/cms-kit/src/Volo.CmsKit.Admin.Web/Volo.CmsKit.Admin.Web.csproj

@ -19,6 +19,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" />
<PackageReference Include="Volo.Abp.SettingManagement.Web" />
</ItemGroup>
<ItemGroup>

Loading…
Cancel
Save