From 44f2ff5c780c0c0bc66a5f6ddfda07ce0b6b1fdf Mon Sep 17 00:00:00 2001 From: xyfy Date: Fri, 5 Nov 2021 10:59:35 +0800 Subject: [PATCH 1/5] Update Entity-Framework-Core-MySQL.md as [this change](https://github.com/PomeloFoundation/Pomelo.EntityFrameworkCore.MySql/commit/6aac749dc0190cd16e3869f05dee4694eafdf75f?diff=split) ServerVersion.FromString renamed to ServerVersion.Parse --- docs/en/Entity-Framework-Core-MySQL.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/Entity-Framework-Core-MySQL.md b/docs/en/Entity-Framework-Core-MySQL.md index 92a9cfb36e..fa43a85930 100644 --- 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. From 34a71ca42d79301686cf12d34a748e4b1771ae0d Mon Sep 17 00:00:00 2001 From: Enis Necipoglu Date: Mon, 7 Mar 2022 14:33:49 +0300 Subject: [PATCH 2/5] Add username as entityDisplayName to Permission Modal --- .../Pages/Identity/UserManagement.razor.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 index 67b002fc4a..982f77882d 100644 --- 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 @@ public partial class UserManagement Clicked = async (data) => { await PermissionManagementModal.OpenAsync(PermissionProviderName, - data.As().Id.ToString()); + data.As().Id.ToString(), + data.As().UserName); } }, new EntityAction From f5481b032f040e754ef84170c1f2d83cffcbcf7c Mon Sep 17 00:00:00 2001 From: haiping fan <36148573+hpfan@users.noreply.github.com> Date: Tue, 8 Mar 2022 11:25:01 +0800 Subject: [PATCH 3/5] Update Part-5.md Fix doc issue which should be "edit". --- docs/zh-Hans/Tutorials/Part-5.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/zh-Hans/Tutorials/Part-5.md b/docs/zh-Hans/Tutorials/Part-5.md index 376766d5ae..78522373ad 100644 --- a/docs/zh-Hans/Tutorials/Part-5.md +++ b/docs/zh-Hans/Tutorials/Part-5.md @@ -458,7 +458,7 @@ export class BookRoutingModule {} ```` -* 加入 `*abpPermission="'BookStore.Books.Create'"`, 当用户没有编辑权限时隐藏按钮. +* 加入 `*abpPermission="'BookStore.Books.Edit'"`, 当用户没有编辑权限时隐藏按钮. * 加入 `*abpPermission="'BookStore.Books.Delete'"`, 当用户没有删除权限时隐藏按钮. {{else if UI == "Blazor"}} From 9eac77f41e81497386501118df5de12a1a3a1c6b Mon Sep 17 00:00:00 2001 From: haiping fan <36148573+hpfan@users.noreply.github.com> Date: Tue, 8 Mar 2022 11:36:13 +0800 Subject: [PATCH 4/5] Update doc Part-4.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit should be 第四章 for cn version. --- docs/zh-Hans/Tutorials/Part-4.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/zh-Hans/Tutorials/Part-4.md b/docs/zh-Hans/Tutorials/Part-4.md index 0d7d7315df..a808130394 100644 --- 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] { From 148371319d222e7a3251fac1e75dcdaa7b2c2546 Mon Sep 17 00:00:00 2001 From: muhammedaltug Date: Tue, 8 Mar 2022 16:08:07 +0300 Subject: [PATCH 5/5] update rel-5.1 auto pr action --- .github/workflows/auto-pr.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index 71b6bea747..4615b379f4 100644 --- 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 }}