Update ajax views (#102)

* separating auditlog views

* fixing version

.gitignore

@@ -108,3 +108,4 @@ ENV/
 # intelliJ
 *.idea
 *.iml
+.vscode

handyhelpers/__init__.py

@@ -7,7 +7,7 @@
 """
 
 __title__ = 'django-handyhelpers'
-__version__ = '0.3.0'
+__version__ = '0.3.1'
 __author__ = 'David Slusser'
 __email__ = 'dbslusser@gmail.com'
 __license__ = 'GPL-3.0'

handyhelpers/context_processors.py

@@ -2,4 +2,4 @@
 
 
 def base_template(request):
-    return {'BASE_TEMPLATE': getattr(settings, 'BASE_TEMPLATE', 'handyhelpers/handyhelpers_base.htm')}
+    return {'BASE_TEMPLATE': getattr(settings, 'BASE_TEMPLATE', 'handyhelpers/handyhelpers_base_bs5.htm')}

handyhelpers/urls.py

@@ -1,9 +1,14 @@
+from django.conf import settings
 from django.urls import path
 from handyhelpers.views import action
 from handyhelpers.views import ajax
 from handyhelpers.views import host
 from handyhelpers.views import htmx
 
+if 'auditlog' in settings.INSTALLED_APPS:
+    from handyhelpers.views import auditlog
+
+
 app_name = 'handyhelpers'
 
 urlpatterns = [
@@ -24,10 +29,16 @@
     path('host_process_details/', ajax.GetHostProcessDetails.as_view(), name='host_process_details'),
     path('host_partition_usage/', ajax.GetHostParitionUsage.as_view(), name='host_partition_usage'),
     path('get_host_cpu_stats/', ajax.GetHostCpuStats.as_view(), name='get_host_cpu_stats'),
-    path('get_auditlog_entries/<str:model_name>/<str:pk>/', ajax.GetAuditLogEntries.as_view(), name='get_auditlog_entries'),
-    path('get_auditlog_entry/<int:id>/', ajax.GetAuditLogEntry.as_view(), name='get_auditlog_entry'),
 
     # htmx views
     path('get_host_processes/', htmx.GetHostProcesses.as_view(), name='get_host_processes'),
 
 ]
+
+if 'auditlog' in settings.INSTALLED_APPS:
+    urlpatterns.extend(
+        [
+            path('get_auditlog_entries/<str:model_name>/<str:pk>/', auditlog.GetAuditLogEntries.as_view(), name='get_auditlog_entries'),
+            path('get_auditlog_entry/<int:id>/', auditlog.GetAuditLogEntry.as_view(), name='get_auditlog_entry'),
+        ]
+    )

handyhelpers/views/ajax.py

@@ -2,12 +2,8 @@
 import psutil
 
 from django.views import View
-from django.apps import apps
 from django.http import HttpResponse
 from django.template import loader
-from django.views.decorators.http import require_GET
-
-from auditlog.models import LogEntry
 
 
 class AjaxGetView(View):
@@ -27,40 +23,6 @@ def get(self, request, *args, **kwargs):
             return HttpResponse(json.dumps({'server_response': self.template.render({'data': None})}),
                                     content_type='application/javascript')
 
-
-class GetAuditLogEntries(AjaxGetView):
-    """
-    Description:
-        Get AuditLog entries for a given model and instance.
-    Args:
-        request: AJAX request object.
-    Returns:
-        HttpResponse: JSON formatted response.
-    """
-    template = loader.get_template('handyhelpers/ajax/get_auditlog_entries.htm')
-
-    def get(self, request, *args, **kwargs):
-        self.data = LogEntry.objects.filter(content_type__model=kwargs['model_name'], 
-                                       object_pk=kwargs['pk'])
-        return super().get(request, *args, **kwargs)
-
-
-class GetAuditLogEntry(AjaxGetView):
-    """
-    Description:
-        Get details for a LogEntry of auditlog..
-    Args:
-        request: AJAX request object.
-    Returns:
-        HttpResponse: JSON formatted response.
-    """
-    template = loader.get_template('handyhelpers/ajax/get_auditlog_entry.htm')
-
-    def get(self, request, *args, **kwargs):
-        self.data = LogEntry.objects.filter(id=kwargs['id'])
-        return super().get(request, *args, **kwargs)
-
-
 
 class GetHostNetworkStats(AjaxGetView):
     """
@@ -134,4 +96,4 @@ def get(self, request, *args, **kwargs):
             time_percent=psutil.cpu_times_percent(percpu=True)[cpu],
             frequency=psutil.cpu_freq(percpu=True)[cpu],
         )
-        return super().get(request, *args, **kwargs)
+        return super().get(request, *args, **kwargs)

handyhelpers/views/auditlog.py

@@ -0,0 +1,36 @@
+from django.template import loader
+from auditlog.models import LogEntry
+
+from .ajax import AjaxGetView
+
+class GetAuditLogEntries(AjaxGetView):
+    """
+    Description:
+        Get AuditLog entries for a given model and instance.
+    Args:
+        request: AJAX request object.
+    Returns:
+        HttpResponse: JSON formatted response.
+    """
+    template = loader.get_template('handyhelpers/ajax/get_auditlog_entries.htm')
+
+    def get(self, request, *args, **kwargs):
+        self.data = LogEntry.objects.filter(content_type__model=kwargs['model_name'], 
+                                       object_pk=kwargs['pk'])
+        return super().get(request, *args, **kwargs)
+
+
+class GetAuditLogEntry(AjaxGetView):
+    """
+    Description:
+        Get details for a LogEntry of auditlog..
+    Args:
+        request: AJAX request object.
+    Returns:
+        HttpResponse: JSON formatted response.
+    """
+    template = loader.get_template('handyhelpers/ajax/get_auditlog_entry.htm')
+
+    def get(self, request, *args, **kwargs):
+        self.data = LogEntry.objects.filter(id=kwargs['id'])
+        return super().get(request, *args, **kwargs)