WIP: Audit modal works

Need to get the ID search working.

assets/views.py

@@ -4,9 +4,11 @@ from django.http import HttpResponse, Http404
 from django.views import generic
 from django.views.decorators.csrf import csrf_exempt
 from django.utils.decorators import method_decorator
-from django.urls import reverse
+from django.urls import reverse_lazy, reverse
 from django.db.models import Q
 from django.shortcuts import get_object_or_404
+from django.core import serializers
+from django.contrib import messages
 from assets import models, forms
 from RIGS import versioning
 
@@ -110,7 +112,14 @@ class AssetEdit(LoginRequiredMixin, AssetIDUrlMixin, generic.UpdateView):
         return context
 
     def get_success_url(self):
-        return reverse("asset_detail", kwargs={"pk": self.object.asset_id})
+        if self.request.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]))
+            messages.info(self.request, "modalobject[0]['update_url']='" + update_url + "'")
+        else:
+            url = reverse_lazy('asset_detail', kwargs={'pk': self.object.asset_id, })
+        return url
 
 
 class AssetCreate(LoginRequiredMixin, generic.CreateView):
@@ -174,24 +183,13 @@ class AssetEmbed(AssetDetail):
     template_name = 'asset_embed.html'
 
 
-class AssetAuditList(LoginRequiredMixin, generic.ListView):
-    model = models.Asset
-    template_name = 'asset_list.html'
-    paginate_by = 40
-    ordering = ['-pk']
+@method_decorator(csrf_exempt, name='dispatch')
+class AssetAuditList(AssetList):
+    template_name = 'asset_audit_list.html'
 
 
-class AssetAudit(LoginRequiredMixin, AssetIDUrlMixin, generic.UpdateView):
+class AssetAudit(AssetEdit):
     template_name = 'asset_audit.html'
-    model = models.Asset
-    form_class = forms.AssetForm
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context['edit'] = True
-        context['connectors'] = models.Connector.objects.all()
-
-        return context
 
     def get_success_url(self):
         # TODO For some reason this doesn't stick when done in form_valid??
@@ -199,7 +197,7 @@ class AssetAudit(LoginRequiredMixin, AssetIDUrlMixin, generic.UpdateView):
         asset.last_audited_by = self.request.user
         asset.last_audited_at = datetime.datetime.now()
         asset.save()
-        return reverse("asset_audit_list")
+        return super().get_success_url()
 
 
 class SupplierList(generic.ListView):