From 75fe83a41fee5f9c50339962629367597fdc9f20 Mon Sep 17 00:00:00 2001 From: sinavir Date: Wed, 27 Sep 2023 14:21:15 +0200 Subject: [PATCH] Bugfix: ajax not working while using SCRIPT_NAME --- hackens_orga/budget/urls.py | 15 ++++++++++++--- hackens_orga/frontend/static/js/budget_list.js | 4 ++-- .../frontend/templates/frontend/budget_list.html | 8 +++++++- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/hackens_orga/budget/urls.py b/hackens_orga/budget/urls.py index 8b14c12..cafc26d 100644 --- a/hackens_orga/budget/urls.py +++ b/hackens_orga/budget/urls.py @@ -1,4 +1,5 @@ -"""backend URL Configuration +""" +backend URL Configuration """ from rest_framework import routers @@ -7,8 +8,16 @@ from .views import BudgetGroupViewSet, BudgetLineViewSet router = routers.DefaultRouter() -router.register(r"budgetgroup", BudgetGroupViewSet) -router.register(r"budgetline", BudgetLineViewSet) +router.register( + r"budgetgroup", + BudgetGroupViewSet, + basename="budgetgroup", +) +router.register( + r"budgetline", + BudgetLineViewSet, + basename="budgetline", +) app_name = "budget-backend" urlpatterns = router.urls diff --git a/hackens_orga/frontend/static/js/budget_list.js b/hackens_orga/frontend/static/js/budget_list.js index a120000..7816a4d 100644 --- a/hackens_orga/frontend/static/js/budget_list.js +++ b/hackens_orga/frontend/static/js/budget_list.js @@ -17,7 +17,7 @@ document.addEventListener('DOMContentLoaded', () => { .split('; ') .find((row) => row.startsWith('csrftoken=')) ?.split('=')[1]; - const url = `/api/budget/budgetline/${target}/`; + const url = el.dataset.lineurl; tableLine.classList.add("tr-disabled"); await fetch(url, { method: 'DELETE', @@ -27,7 +27,7 @@ document.addEventListener('DOMContentLoaded', () => { }).then((resp) => { if(resp.ok) { tableLine.remove(); - const url = `/api/budget/budgetgroup/${group}`; + const url = el.dataset.groupurl; budgetAmount.innerHTML = "---"; return fetch(url); } else { diff --git a/hackens_orga/frontend/templates/frontend/budget_list.html b/hackens_orga/frontend/templates/frontend/budget_list.html index f5bf808..08a90ab 100644 --- a/hackens_orga/frontend/templates/frontend/budget_list.html +++ b/hackens_orga/frontend/templates/frontend/budget_list.html @@ -83,7 +83,13 @@ {% if perms.budget.delete_budgetline %} - {% endif %}