From 2d7eec6a53d3a0b62859c9057c0f07c3e4dd2e67 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Wed, 27 Jun 2018 16:21:04 +0300 Subject: [PATCH] Small fixes in blog module --- .../app/Volo.BloggingTestApp/BloggingTestAppModule.cs | 3 ++- .../Volo/Blogging/BloggingPermissionDefinitionProvider.cs | 6 +++--- .../Volo/Blogging/BloggingPermissions.cs | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs b/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs index 34aeda707a..a43ab5be91 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs +++ b/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Globalization; using System.IO; +using System.Linq; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Localization; @@ -138,7 +139,7 @@ namespace Volo.BloggingTestApp .GetRequiredService() .SeedAsync( "1q2w3E*", - IdentityPermissions.GetAll()//.Union(BlogPermissions.GetAll()) //TODO: Define blog permissions + IdentityPermissions.GetAll().Union(BloggingPermissions.GetAll()) ); }); } diff --git a/modules/blogging/src/Volo.Blogging.Application.Contracts/Volo/Blogging/BloggingPermissionDefinitionProvider.cs b/modules/blogging/src/Volo.Blogging.Application.Contracts/Volo/Blogging/BloggingPermissionDefinitionProvider.cs index 6afbae7f6e..0fb9b5b707 100644 --- a/modules/blogging/src/Volo.Blogging.Application.Contracts/Volo/Blogging/BloggingPermissionDefinitionProvider.cs +++ b/modules/blogging/src/Volo.Blogging.Application.Contracts/Volo/Blogging/BloggingPermissionDefinitionProvider.cs @@ -11,14 +11,14 @@ namespace Volo.Blogging { public override void Define(IPermissionDefinitionContext context) { - var qaGroup = context.AddGroup(BloggingPermissions.GroupName, L("Permission:Blogging")); + var bloggingGroup = context.AddGroup(BloggingPermissions.GroupName, L("Permission:Blogging")); - var blogs = qaGroup.AddPermission(BloggingPermissions.Blogs.Default, L("Permission:BlogManagement")); + var blogs = bloggingGroup.AddPermission(BloggingPermissions.Blogs.Default, L("Permission:BlogManagement")); blogs.AddChild(BloggingPermissions.Blogs.Update, L("Permission:Edit")); blogs.AddChild(BloggingPermissions.Blogs.Delete, L("Permission:Delete")); blogs.AddChild(BloggingPermissions.Blogs.Create, L("Permission:Delete")); - var posts = qaGroup.AddPermission(BloggingPermissions.Posts.Default, L("Permission:PostManagement")); + var posts = bloggingGroup.AddPermission(BloggingPermissions.Posts.Default, L("Permission:PostManagement")); posts.AddChild(BloggingPermissions.Posts.Update, L("Permission:Edit")); posts.AddChild(BloggingPermissions.Posts.Delete, L("Permission:Delete")); posts.AddChild(BloggingPermissions.Posts.Create, L("Permission:Delete")); diff --git a/modules/blogging/src/Volo.Blogging.Application.Contracts/Volo/Blogging/BloggingPermissions.cs b/modules/blogging/src/Volo.Blogging.Application.Contracts/Volo/Blogging/BloggingPermissions.cs index 48cd12c406..ab86e7c0a0 100644 --- a/modules/blogging/src/Volo.Blogging.Application.Contracts/Volo/Blogging/BloggingPermissions.cs +++ b/modules/blogging/src/Volo.Blogging.Application.Contracts/Volo/Blogging/BloggingPermissions.cs @@ -36,7 +36,7 @@ namespace Volo.Blogging Posts.Default, Posts.Delete, Posts.Update, - Posts.Create, + Posts.Create }; } }