Правки логики

apps/locations/views.py

@@ -8,6 +8,8 @@ from django.views.decorators.http import require_POST
 
 from core.utils.htmx import render_page
 
+from core.location_access import accessible_pharmacies
+
 from .forms import PortalPharmacyEditForm
 from .models import Pharmacy, pharmacy_card_flags, user_can_edit_pharmacy
 
@@ -68,7 +70,7 @@ def _pharmacy_detail_context(request, pharmacy, *, form=None, edit_mode=False,
 
     can_edit = flags['can_edit']
     if edit_mode and can_edit and form is None:
-        form = PortalPharmacyEditForm(instance=pharmacy)
+        form = PortalPharmacyEditForm(instance=pharmacy, user=request.user)
 
     return {
         'pharmacy': pharmacy,
@@ -94,7 +96,7 @@ def _pharmacy_detail_context(request, pharmacy, *, form=None, edit_mode=False,
 @require_POST
 def pharmacy_update_view(request, pk):
     pharmacy = get_object_or_404(
-        Pharmacy.objects.select_related(
+        accessible_pharmacies(request.user).select_related(
             'organization', 'location_region', 'head_pharmacist__post',
             'responsible_manager', 'curator',
         ).prefetch_related('phones'),
@@ -103,7 +105,7 @@ def pharmacy_update_view(request, pk):
     if not user_can_edit_pharmacy(request.user, pharmacy):
         return HttpResponseForbidden()
 
-    form = PortalPharmacyEditForm(request.POST, instance=pharmacy)
+    form = PortalPharmacyEditForm(request.POST, instance=pharmacy, user=request.user)
     if form.is_valid():
         pharmacy = form.save(commit=False)
         pharmacy._history_user = request.user