From f72360dedfce2895bc8cf0a358d16a4c5f84374d Mon Sep 17 00:00:00 2001 From: Salih Date: Tue, 13 Feb 2024 13:39:03 +0300 Subject: [PATCH 1/3] Fix datepicker firefox problem --- .../bootstrap/dom-event-handlers.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/dom-event-handlers.js b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/dom-event-handlers.js index 8e567d626a..6d6cbda64e 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/dom-event-handlers.js +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/dom-event-handlers.js @@ -320,6 +320,8 @@ options.singleDatePicker = singleDatePicker; + var $modal = $datePickerElement.closest('.modal.fade'); + var defaultOptions = { showDropdowns: true, opens: "center", @@ -336,7 +338,8 @@ clearLabel: abp.localization.localize('Clear', 'AbpUi'), applyLabel: abp.localization.localize('Apply', 'AbpUi'), }, - singleOpenAndClearButton: true + singleOpenAndClearButton: true, + parentEl: $modal.length > 0 ? $modal : 'body' }; var locale = defaultOptions.locale; $.extend(options, defaultOptions); From 1d24da24753312a68519d5b984d298a227fa3ec8 Mon Sep 17 00:00:00 2001 From: selman koc <64414348+skoc10@users.noreply.github.com> Date: Wed, 14 Feb 2024 11:34:27 +0300 Subject: [PATCH 2/3] Update auto-pr.yml for rel-8.1 --- .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 6ca52cfd0a..639a88c72e 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -1,4 +1,4 @@ -name: Merge branch prerel-8.1 with rel-8.0 +name: Merge branch rel-8.1 with rel-8.0 on: push: branches: @@ -7,7 +7,7 @@ permissions: contents: read jobs: - merge-prerel-8-1-with-rel-8-0: + merge-rel-8-1-with-rel-8-0: permissions: contents: write # for peter-evans/create-pull-request to create branch pull-requests: write # for peter-evans/create-pull-request to create a PR @@ -15,7 +15,7 @@ jobs: steps: - uses: actions/checkout@v2 with: - ref: prerel-8.1 + ref: rel-8.1 - name: Reset promotion branch run: | git fetch origin rel-8.0:rel-8.0 @@ -24,8 +24,8 @@ jobs: uses: peter-evans/create-pull-request@v3 with: branch: auto-merge/rel-8-0/${{github.run_number}} - title: Merge branch prerel-8.1 with rel-8.0 - body: This PR generated automatically to merge prerel-8.1 with rel-8.0. Please review the changed files before merging to prevent any errors that may occur. + title: Merge branch rel-8.1 with rel-8.0 + body: This PR generated automatically to merge rel-8.1 with rel-8.0. Please review the changed files before merging to prevent any errors that may occur. reviewers: maliming token: ${{ github.token }} - name: Merge Pull Request From dfd99ff2af92954da8964ed239e873fd8783ba37 Mon Sep 17 00:00:00 2001 From: selman koc <64414348+skoc10@users.noreply.github.com> Date: Wed, 14 Feb 2024 11:57:33 +0300 Subject: [PATCH 3/3] Update auto-pr.yml --- .github/workflows/auto-pr.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index 639a88c72e..e38c381c88 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -1,13 +1,13 @@ -name: Merge branch rel-8.1 with rel-8.0 +name: Merge branch dev with rel-8.1 on: push: branches: - - rel-8.0 + - rel-8.1 permissions: contents: read jobs: - merge-rel-8-1-with-rel-8-0: + merge-dev-with-rel-8-1: permissions: contents: write # for peter-evans/create-pull-request to create branch pull-requests: write # for peter-evans/create-pull-request to create a PR @@ -15,22 +15,22 @@ jobs: steps: - uses: actions/checkout@v2 with: - ref: rel-8.1 + ref: dev - name: Reset promotion branch run: | - git fetch origin rel-8.0:rel-8.0 - git reset --hard rel-8.0 + git fetch origin rel-8.1:rel-8.1 + git reset --hard rel-8.1 - name: Create Pull Request uses: peter-evans/create-pull-request@v3 with: - branch: auto-merge/rel-8-0/${{github.run_number}} - title: Merge branch rel-8.1 with rel-8.0 - body: This PR generated automatically to merge rel-8.1 with rel-8.0. Please review the changed files before merging to prevent any errors that may occur. + branch: auto-merge/rel-8-1/${{github.run_number}} + title: Merge branch dev with rel-8.1 + body: This PR generated automatically to merge dev with rel-8.1. Please review the changed files before merging to prevent any errors that may occur. reviewers: maliming token: ${{ github.token }} - name: Merge Pull Request env: GH_TOKEN: ${{ secrets.BOT_SECRET }} run: | - gh pr review auto-merge/rel-8-0/${{github.run_number}} --approve - gh pr merge auto-merge/rel-8-0/${{github.run_number}} --merge --auto --delete-branch + gh pr review auto-merge/rel-8-1/${{github.run_number}} --approve + gh pr merge auto-merge/rel-8-1/${{github.run_number}} --merge --auto --delete-branch