Skip to content

Fix delete u2f keys bug (#18040) #18042

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 4 commits into from
Dec 20, 2021
Merged

Fix delete u2f keys bug (#18040) #18042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8e7637b
Fix delete u2f keys bug
lunny Dec 20, 2021
a3dff53
Merge branch 'release/v1.15' into lunnyfix_delete_keys2
zeripath Dec 20, 2021
1971d8e
Merge branch 'release/v1.15' into lunnyfix_delete_keys2
zeripath Dec 20, 2021
6030303
Merge branch 'release/v1.15' into lunnyfix_delete_keys2
techknowlogick Dec 20, 2021
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
2 changes: 1 addition & 1 deletion templates/user/settings/security_u2f.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
{{range .U2FRegistrations}}
<div class="item">
<div class="right floated content">
<button class="ui red tiny button delete-button" id="delete-registration" data-url="{{$.Link}}/u2f/delete" data-id="{{.ID}}">
<button class="ui red tiny button delete-button" modal-id="delete-registration" data-url="{{$.Link}}/u2f/delete" data-id="{{.ID}}">
{{$.i18n.Tr "settings.delete_key"}}
</button>
</div>
Expand Down
4 changes: 2 additions & 2 deletions web_src/js/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2959,8 +2959,8 @@ $(() => {
function showDeletePopup() {
const $this = $(this);
let filter = '';
if ($this.attr('id')) {
filter += `#${$this.attr('id')}`;
if ($this.attr('modal-id')) {
filter += `#${$this.attr('modal-id')}`;
}

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