Merge pull request abpframework#11851 from abpframework/auto-merge/re…

…l-5-1/905 Merge branch rel-5.2 with rel-5.1
yangxueminghao · Mar 8, 2022 · be8a998 · be8a998
2 parents 88aab4b + 0435e1e
commit be8a998
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml
@@ -1,15 +1,15 @@
-name: Merge branch dev with rel-5.1
+name: Merge branch rel-5.2 with rel-5.1
 on:
   push:
     branches:
       - rel-5.1
 jobs:
-  merge-dev-with-rel-5-1:
+  merge-rel-5-2-with-rel-5-1:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
         with:
-          ref: dev
+          ref: rel-5.2
       - name: Reset promotion branch
         run: |
           git fetch origin rel-5.1:rel-5.1
@@ -18,7 +18,7 @@ jobs:
         uses: peter-evans/create-pull-request@v3
         with:
           branch: auto-merge/rel-5-1/${{github.run_number}}
-          title: Merge branch dev with rel-5.1
-          body: This PR generated automatically to merge dev with rel-5.1. Please review the changed files before merging to prevent any errors that may occur.
+          title: Merge branch rel-5.2 with rel-5.1
+          body: This PR generated automatically to merge rel-5.2 with rel-5.1. Please review the changed files before merging to prevent any errors that may occur.
           reviewers: ${{github.actor}}
           token: ${{ github.token }}
diff --git a/docs/en/Entity-Framework-Core-MySQL.md b/docs/en/Entity-Framework-Core-MySQL.md
@@ -15,7 +15,7 @@ Find ***YourProjectName*EntityFrameworkCoreModule** class inside the `.EntityFra
 Find `UseSqlServer()` calls in your solution. Check the following files:
 
 * *YourProjectName*EntityFrameworkCoreModule.cs inside the `.EntityFrameworkCore` project. Replace `UseSqlServer()` with `UseMySQL()`.
-* *YourProjectName*DbContextFactory.cs inside the `.EntityFrameworkCore` project. Replace `UseSqlServer()` with `UseMySql()`. Then add a new parameter (`ServerVersion`) to `UseMySql()` method. Example: `.UseMySql(configuration.GetConnectionString("Default"), ServerVersion.FromString("8.0.21-mysql"))`. See [this issue](https://github.com/PomeloFoundation/Pomelo.EntityFrameworkCore.MySql/pull/1233) for more information about `ServerVersion`)
+* *YourProjectName*DbContextFactory.cs inside the `.EntityFrameworkCore` project. Replace `UseSqlServer()` with `UseMySql()`. Then add a new parameter (`ServerVersion`) to `UseMySql()` method. Example: `.UseMySql(configuration.GetConnectionString("Default"), ServerVersion.Parse("8.0.21-mysql"))`. See [this issue](https://github.com/PomeloFoundation/Pomelo.EntityFrameworkCore.MySql/pull/1233) for more information about `ServerVersion`)
 
 > Depending on your solution structure, you may find more code files need to be changed.
 

diff --git a/docs/zh-Hans/Tutorials/Part-4.md b/docs/zh-Hans/Tutorials/Part-4.md
@@ -1,4 +1,4 @@
-# Web应用程序开发教程 - 第三章: 集成测试
+# Web应用程序开发教程 - 第四章: 集成测试
 ````json
 //[doc-params]
 {

diff --git a/docs/zh-Hans/Tutorials/Part-5.md b/docs/zh-Hans/Tutorials/Part-5.md
@@ -458,7 +458,7 @@ export class BookRoutingModule {}
 </button>
 ````
 
-* 加入 `*abpPermission="'BookStore.Books.Create'"`, 当用户没有编辑权限时隐藏按钮.
+* 加入 `*abpPermission="'BookStore.Books.Edit'"`, 当用户没有编辑权限时隐藏按钮.
 * 加入 `*abpPermission="'BookStore.Books.Delete'"`, 当用户没有删除权限时隐藏按钮.
 
 {{else if UI == "Blazor"}}

diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs
@@ -147,7 +147,8 @@ protected override ValueTask SetEntityActionsAsync()
                         Clicked = async (data) =>
                         {
                             await PermissionManagementModal.OpenAsync(PermissionProviderName,
-                                data.As<IdentityUserDto>().Id.ToString());
+                                data.As<IdentityUserDto>().Id.ToString(),
+                                data.As<IdentityUserDto>().UserName);
                         }
                     },
                     new EntityAction