Skip to content

Fix duplicate modals when clicking on "remove all" repository button #24129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Apr 18, 2023
Merged

Fix duplicate modals when clicking on "remove all" repository button #24129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4df0a52
fix duplicate modals
HesterG Apr 14, 2023
c99db35
fix
wxiaoguang Apr 14, 2023
e907a5d
Merge branch 'main' into fix-duplicate-modal
HesterG Apr 17, 2023
fa72d12
Merge branch 'main' into fix-duplicate-modal
HesterG Apr 17, 2023
3d4194b
Merge branch 'main' into fix-duplicate-modal
HesterG Apr 18, 2023
2cfdbbe
Merge branch 'main' into fix-duplicate-modal
HesterG Apr 18, 2023
e288438
Merge branch 'main' into fix-duplicate-modal
GiteaBot Apr 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions templates/org/team/repositories.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
</div>
<div class="inline ui field right">
<form class="ui form" id="repo-multiple-form" action="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/repositories" method="post">
<button class="ui red button delete-button right" data-url="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/action/repo/removeall">{{.locale.Tr "remove_all"}}</button>
<button class="ui green button add-all-button right" data-url="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/action/repo/addall">{{.locale.Tr "add_all"}}</button>
<button class="ui red button delete-button right" data-modal-id="org-team-remove-all-repo" data-url="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/action/repo/removeall">{{.locale.Tr "remove_all"}}</button>
<button class="ui green button add-all-button right" data-modal-id="org-team-add-all-repo" data-url="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/action/repo/addall">{{.locale.Tr "add_all"}}</button>
</form>
</div>
</div>
Expand Down Expand Up @@ -64,7 +64,7 @@
</div>
</div>

<div class="ui small basic delete modal">
<div class="ui small basic delete modal" id="org-team-remove-all-repo">
<div class="ui icon header">
{{svg "octicon-trash"}}
{{.locale.Tr "org.teams.remove_all_repos_title"}}
Expand All @@ -75,7 +75,7 @@
{{template "base/delete_modal_actions" .}}
</div>

<div class="ui small basic addall modal">
<div class="ui small basic addall modal" id="org-team-add-all-repo">
<div class="ui icon header">
{{svg "octicon-globe"}}
{{.locale.Tr "org.teams.add_all_repos_title"}}
Expand Down
8 changes: 4 additions & 4 deletions web_src/js/features/common-global.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,8 @@ export function initGlobalLinkActions() {
const $this = $(this);
const dataArray = $this.data();
let filter = '';
if ($this.data('modal-id')) {
filter += `#${$this.data('modal-id')}`;
if ($this.attr('data-modal-id')) {
filter += `#${$this.attr('data-modal-id')}`;
}

const dialog = $(`.delete.modal${filter}`);
Expand Down Expand Up @@ -237,8 +237,8 @@ export function initGlobalLinkActions() {
e.preventDefault();
const $this = $(this);
let filter = '';
if ($this.attr('id')) {
filter += `#${$this.attr('id')}`;
if ($this.attr('data-modal-id')) {
filter += `#${$this.attr('data-modal-id')}`;
}

const dialog = $(`.addall.modal${filter}`);
Expand Down