FreakU
/
Retrospring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1012 from Retrospring/bugfix/author-deletes 

Fix author-searched deletion in inbox not working
This commit is contained in:
Karina Kwiatek 2023-01-29 09:01:24 +01:00 committed by GitHub
parent 452266b77a 6c25594b88
commit 7c1057acb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/javascript/retrospring/features/inbox/author.ts
View File

@ -1,6 +0,0 @@
export function authorSearchHandler(event: Event): void {
event.preventDefault();
const author = document.querySelector<HTMLInputElement>('#author')?.value;
window.location.href = `/inbox/${encodeURIComponent(author)}`;
}

5
app/javascript/retrospring/features/inbox/delete.ts
View File

@ -62,6 +62,7 @@ export function deleteAllQuestionsHandler(event: Event): void {
export function deleteAllAuthorQuestionsHandler(event: Event): void {
const button = event.target as Element;
const count = button.getAttribute('data-ib-count');
const urlSearchParams = new URLSearchParams(window.location.search);
swal({
title: I18n.translate('frontend.inbox.confirm_all.title', { count: count }),
@ -75,7 +76,7 @@ export function deleteAllAuthorQuestionsHandler(event: Event): void {
}, (returnValue) => {
if (returnValue === null) return false;
post(`/ajax/delete_all_inbox/${location.pathname.split('/')[2]}`)
post(`/ajax/delete_all_inbox/${urlSearchParams.get('author')}`)
.then(async response => {
const data = await response.json;
@ -89,4 +90,4 @@ export function deleteAllAuthorQuestionsHandler(event: Event): void {
showErrorNotification(I18n.translate('frontend.error.message'));
});
});
}
}

3
app/javascript/retrospring/features/inbox/index.ts
View File

@ -6,8 +6,7 @@ import { deleteAllAuthorQuestionsHandler, deleteAllQuestionsHandler } from './de
export default (): void => {
registerEvents([
{ type: 'click', target: '#ib-delete-all', handler: deleteAllQuestionsHandler, global: true },
{ type: 'click', target: '#ib-delete-all-author', handler: deleteAllAuthorQuestionsHandler, global: true },
{ type: 'submit', target: '#author-form', handler: authorSearchHandler, global: true }
{ type: 'click', target: '#ib-delete-all-author', handler: deleteAllAuthorQuestionsHandler, global: true }
]);
registerInboxEntryEvents();