rewrite url scemata

billard/views.py

@@ -31,7 +31,9 @@ class LocationDetailView(generic.DetailView):
                 'location': self.get_object(),
             }
             return render(request, template_name='billard/location_detail_ajax.html', context=context)
-        return super(LocationDetailView, self).dispatch(request, *args, **kwargs)
+        result = super(LocationDetailView, self).dispatch(request, *args, **kwargs)
+        result.context_data['pk'] = self.kwargs['pk']
+        return result
 
 
 @method_decorator(login_required, name='dispatch')
@@ -67,7 +69,7 @@ def accounting_confirm(request, pk):
 
 
 @login_required
-def account_modal_view(request):
+def account_modal_view(request, loc_pk):
     try:
         uuids = Client.objects.filter(report_user=request.user).values_list('uuid')
         account = Accounting.objects.filter(reporter_uuid__in=uuids).first
@@ -75,17 +77,18 @@ def account_modal_view(request):
     except Client.DoesNotExist:
         account = None
     context = {
-        'account': account
+        'account': account,
+        'loc_pk': loc_pk,
     }
     return render(request, 'billard/accountmodal.html', context=context)
 
 
 @login_required
-def account_modal_confirm_view(request, pk):
+def account_modal_confirm_view(request, loc_pk, pk):
     account = Accounting.objects.get(pk=pk)
     account.reporter_uuid = None
     account.save()
-    return redirect('billard:location_detail', pk=account.desk.client.location_id)
+    return redirect('billard:location_detail', pk=loc_pk)
 
 
 class LocationDataViewSet(viewsets.ModelViewSet):