arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-25 17:32:16 +00:00
Code Issues Projects Releases Wiki Activity

Update view logic for is_ajax being changed to a template context processor

Browse Source
This commit is contained in:
FreneticScribbler
2025-10-05 20:03:50 +01:00
parent 93c576fad8
commit 7d9185e155
6 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/templates/asset_form.html
View File

@@ -1,4 +1,4 @@
{% extends 'base_assets.html' %}
{% extends is_ajax|yesno:"base_ajax.html,base_assets.html" %}
{% load widget_tweaks %}
{% load static %}

10
assets/views.py
View File

@@ -127,7 +127,7 @@ class AssetEdit(LoginRequiredMixin, AssetIDUrlMixin, generic.UpdateView):
return context
def get_success_url(self):
if is_ajax(self.request):
if is_ajax(self.request).get('is_ajax'):
url = reverse_lazy('closemodal')
update_url = str(reverse_lazy('asset_update', kwargs={'pk': self.object.pk}))
messages.info(self.request, "modalobject=" + serializers.serialize("json", [self.object]))
@@ -233,7 +233,7 @@ class SupplierList(GenericListView):
context['edit'] = 'supplier_update'
context['can_edit'] = self.request.user.has_perm('assets.change_supplier')
context['detail'] = 'supplier_detail'
if is_ajax(self.request):
if is_ajax(self.request).get('is_ajax'):
context['override'] = "base_ajax.html"
else:
context['override'] = 'base_assets.html'
@@ -250,7 +250,7 @@ class SupplierDetail(GenericDetailView):
context['detail_link'] = 'supplier_detail'
context['associated'] = 'partials/associated_assets.html'
context['associated2'] = ''
if is_ajax(self.request):
if is_ajax(self.request).get('is_ajax'):
context['override'] = "base_ajax.html"
else:
context['override'] = 'base_assets.html'
@@ -264,7 +264,7 @@ class SupplierCreate(GenericCreateView, ModalURLMixin):
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
if is_ajax(self.request):
if is_ajax(self.request).get('is_ajax'):
context['override'] = "base_ajax.html"
else:
context['override'] = 'base_assets.html'
@@ -280,7 +280,7 @@ class SupplierUpdate(GenericUpdateView, ModalURLMixin):
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
if is_ajax(self.request):
if is_ajax(self.request).get('is_ajax'):
context['override'] = "base_ajax.html"
else:
context['override'] = 'base_assets.html'