mirror of
https://gitlab.crans.org/bde/nk20
synced 2025-05-10 15:31:32 +00:00
ok
This commit is contained in:
parent
03932672f3
commit
0cf11c6348
@ -234,7 +234,7 @@ class Guest(models.Model):
|
|||||||
"""
|
"""
|
||||||
activity = models.ForeignKey(
|
activity = models.ForeignKey(
|
||||||
Activity,
|
Activity,
|
||||||
on_delete=models.PROTECT,
|
on_delete=models.CASCADE,
|
||||||
related_name='+',
|
related_name='+',
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -95,5 +95,23 @@ SPDX-License-Identifier: GPL-3.0-or-later
|
|||||||
errMsg(xhr.responseJSON);
|
errMsg(xhr.responseJSON);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
$("#delete_activity").click(function () {
|
||||||
|
if (!confirm("{% trans 'Are you sure you want to delete this activity?' %}")) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$.ajax({
|
||||||
|
url: "/api/activity/activity/{{ activity.pk }}/",
|
||||||
|
type: "DELETE",
|
||||||
|
headers: {
|
||||||
|
"X-CSRFTOKEN": CSRF_TOKEN
|
||||||
|
}
|
||||||
|
}).done(function () {
|
||||||
|
addMsg("{% trans 'Activity deleted' %}", "success");
|
||||||
|
window.location.href = "/activity/"; // Redirige vers la liste des activités (à adapter)
|
||||||
|
}).fail(function (xhr) {
|
||||||
|
errMsg(xhr.responseJSON);
|
||||||
|
});
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
@ -70,7 +70,10 @@ SPDX-License-Identifier: GPL-3.0-or-later
|
|||||||
{% if ".change_"|has_perm:activity %}
|
{% if ".change_"|has_perm:activity %}
|
||||||
<a class="btn btn-primary btn-sm my-1" href="{% url 'activity:activity_update' pk=activity.pk %}" data-turbolinks="false"> {% trans "edit"|capfirst %}</a>
|
<a class="btn btn-primary btn-sm my-1" href="{% url 'activity:activity_update' pk=activity.pk %}" data-turbolinks="false"> {% trans "edit"|capfirst %}</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if activity.activity_type.can_invite and not activity_started %}
|
{% if not activity.valid and ".delete_"|has_perm:activity %}
|
||||||
|
<a class="btn btn-danger btn-sm my-1" id="delete_activity"> {% trans "delete"|capfirst %} </a>
|
||||||
|
{% endif %}
|
||||||
|
{% if activity.activity_type.can_invite and not activity_started and activity.valid %}
|
||||||
<a class="btn btn-primary btn-sm my-1" href="{% url 'activity:activity_invite' pk=activity.pk %}" data-turbolinks="false"> {% trans "Invite" %}</a>
|
<a class="btn btn-primary btn-sm my-1" href="{% url 'activity:activity_invite' pk=activity.pk %}" data-turbolinks="false"> {% trans "Invite" %}</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
@ -15,4 +15,5 @@ urlpatterns = [
|
|||||||
path('<int:pk>/update/', views.ActivityUpdateView.as_view(), name='activity_update'),
|
path('<int:pk>/update/', views.ActivityUpdateView.as_view(), name='activity_update'),
|
||||||
path('new/', views.ActivityCreateView.as_view(), name='activity_create'),
|
path('new/', views.ActivityCreateView.as_view(), name='activity_create'),
|
||||||
path('calendar.ics', views.CalendarView.as_view(), name='calendar_ics'),
|
path('calendar.ics', views.CalendarView.as_view(), name='calendar_ics'),
|
||||||
|
path('<int:pk>/delete', views.ActivityDeleteView.as_view(), name='delete_activity'),
|
||||||
]
|
]
|
||||||
|
@ -152,6 +152,21 @@ class ActivityUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
|
|||||||
def get_success_url(self, **kwargs):
|
def get_success_url(self, **kwargs):
|
||||||
return reverse_lazy('activity:activity_detail', kwargs={"pk": self.kwargs["pk"]})
|
return reverse_lazy('activity:activity_detail', kwargs={"pk": self.kwargs["pk"]})
|
||||||
|
|
||||||
|
class ActivityDeleteView(View):
|
||||||
|
def delete(self, request, pk):
|
||||||
|
try:
|
||||||
|
activity = Activity.objects.get(pk=pk)
|
||||||
|
activity.delete()
|
||||||
|
return JsonResponse({"message": "Activity deleted"})
|
||||||
|
except ProtectedError as e:
|
||||||
|
return JsonResponse({"error": "Cannot delete this activity because it is still referenced by guests."}, status=400)
|
||||||
|
except Activity.DoesNotExist:
|
||||||
|
return JsonResponse({"error": "Activity not found"}, status=404)
|
||||||
|
|
||||||
|
def dispatch(self, *args, **kwargs):
|
||||||
|
# Optionnel : restreindre à utilisateur connecté ou permissions
|
||||||
|
return super().dispatch(*args, **kwargs)
|
||||||
|
|
||||||
|
|
||||||
class ActivityInviteView(ProtectQuerysetMixin, ProtectedCreateView):
|
class ActivityInviteView(ProtectQuerysetMixin, ProtectedCreateView):
|
||||||
"""
|
"""
|
||||||
|
Loading…
x
Reference in New Issue
Block a user