Merge pull request #756 from MAKENTNU/fix-reservation-rule-list-view-based-on-machine

Fix incorrect and failing reservation rule lists

Author: Gunvor4

CHANGELOG.md

@@ -14,7 +14,7 @@ A summary of changes made to the codebase, grouped per deployment.
 
 ### Fixes
 
-- 
+- Fixed the reservation rules used in the calendar being incorrect or failing to be fetched
 
 ### Other changes
 

src/make_queue/api/views.py

@@ -11,7 +11,7 @@
 from .forms import APIMachineDataQueryForm, APIReservationListQueryForm
 from ..models.reservation import Quota, Reservation, ReservationRule
 from ..templatetags.reservation_extra import can_delete_reservation, can_mark_reservation_finished
-from ..views.machine import MachineRelatedViewMixin
+from ..views.machine import MachineRelatedViewMixin, MachineTypeRelatedViewMixin
 
 
 class APIMachineDataView(LoginRequiredMixin, MachineRelatedViewMixin, QueryParameterFormMixin, TemplateView):
@@ -48,11 +48,11 @@ def render_to_response(self, context, **response_kwargs):
         return UTF8JsonResponse(context)
 
 
-class APIReservationRuleListView(MachineRelatedViewMixin, ListView):
+class APIReservationRuleListView(MachineTypeRelatedViewMixin, ListView):
     model = ReservationRule
 
     def get_queryset(self):
-        return self.machine.machine_type.reservation_rules.all()
+        return self.machine_type.reservation_rules.all()
 
     def get_context_data(self, **kwargs):
         return {