Просмотр исходного кода

Disabled the creation of new UserActions

Jeremy Stretch 7 лет назад
Родитель
Сommit
a1f6ed1713
3 измененных файлов с 3 добавлено и 26 удалено
  1. 1 13
      netbox/dcim/views.py
  2. 1 2
      netbox/extras/views.py
  3. 1 11
      netbox/utilities/views.py

+ 1 - 13
netbox/dcim/views.py

@@ -18,7 +18,7 @@ from django.views.generic import View
 from natsort import natsorted
 
 from circuits.models import Circuit
-from extras.models import Graph, TopologyMap, GRAPH_TYPE_INTERFACE, GRAPH_TYPE_SITE, UserAction
+from extras.models import Graph, TopologyMap, GRAPH_TYPE_INTERFACE, GRAPH_TYPE_SITE
 from ipam.models import Prefix, Service, VLAN
 from utilities.forms import ConfirmationForm
 from utilities.paginator import EnhancedPaginator
@@ -1108,7 +1108,6 @@ class ConsolePortConnectView(PermissionRequiredMixin, View):
                 escape(consoleport.cs_port.name),
             )
             messages.success(request, mark_safe(msg))
-            UserAction.objects.log_edit(request.user, consoleport, msg)
 
             return redirect('dcim:device', pk=consoleport.device.pk)
 
@@ -1159,7 +1158,6 @@ class ConsolePortDisconnectView(PermissionRequiredMixin, View):
                 escape(cs_port.name),
             )
             messages.success(request, mark_safe(msg))
-            UserAction.objects.log_edit(request.user, consoleport, msg)
 
             return redirect('dcim:device', pk=consoleport.device.pk)
 
@@ -1248,7 +1246,6 @@ class ConsoleServerPortConnectView(PermissionRequiredMixin, View):
                 escape(consoleserverport.name),
             )
             messages.success(request, mark_safe(msg))
-            UserAction.objects.log_edit(request.user, consoleport, msg)
 
             return redirect('dcim:device', pk=consoleserverport.device.pk)
 
@@ -1300,7 +1297,6 @@ class ConsoleServerPortDisconnectView(PermissionRequiredMixin, View):
                 escape(consoleserverport.name),
             )
             messages.success(request, mark_safe(msg))
-            UserAction.objects.log_edit(request.user, consoleport, msg)
 
             return redirect('dcim:device', pk=consoleserverport.device.pk)
 
@@ -1394,7 +1390,6 @@ class PowerPortConnectView(PermissionRequiredMixin, View):
                 escape(powerport.power_outlet.name),
             )
             messages.success(request, mark_safe(msg))
-            UserAction.objects.log_edit(request.user, powerport, msg)
 
             return redirect('dcim:device', pk=powerport.device.pk)
 
@@ -1445,7 +1440,6 @@ class PowerPortDisconnectView(PermissionRequiredMixin, View):
                 escape(power_outlet.name),
             )
             messages.success(request, mark_safe(msg))
-            UserAction.objects.log_edit(request.user, powerport, msg)
 
             return redirect('dcim:device', pk=powerport.device.pk)
 
@@ -1533,7 +1527,6 @@ class PowerOutletConnectView(PermissionRequiredMixin, View):
                 escape(poweroutlet.name),
             )
             messages.success(request, mark_safe(msg))
-            UserAction.objects.log_edit(request.user, powerport, msg)
 
             return redirect('dcim:device', pk=poweroutlet.device.pk)
 
@@ -1584,7 +1577,6 @@ class PowerOutletDisconnectView(PermissionRequiredMixin, View):
                 escape(poweroutlet.name),
             )
             messages.success(request, mark_safe(msg))
-            UserAction.objects.log_edit(request.user, powerport, msg)
 
             return redirect('dcim:device', pk=poweroutlet.device.pk)
 
@@ -1914,7 +1906,6 @@ class InterfaceConnectionAddView(PermissionRequiredMixin, GetReturnURLMixin, Vie
                 escape(interfaceconnection.interface_b.name),
             )
             messages.success(request, mark_safe(msg))
-            UserAction.objects.log_edit(request.user, interfaceconnection, msg)
 
             if '_addanother' in request.POST:
                 base_url = reverse('dcim:interfaceconnection_add', kwargs={'pk': device.pk})
@@ -1965,7 +1956,6 @@ class InterfaceConnectionDeleteView(PermissionRequiredMixin, GetReturnURLMixin,
                 escape(interfaceconnection.interface_b.name),
             )
             messages.success(request, mark_safe(msg))
-            UserAction.objects.log_edit(request.user, interfaceconnection, msg)
 
             return redirect(self.get_return_url(request, interfaceconnection))
 
@@ -2245,7 +2235,6 @@ class VirtualChassisAddMemberView(PermissionRequiredMixin, GetReturnURLMixin, Vi
                 membership_form.save()
                 msg = 'Added member <a href="{}">{}</a>'.format(device.get_absolute_url(), escape(device))
                 messages.success(request, mark_safe(msg))
-                UserAction.objects.log_edit(request.user, device, msg)
 
                 if '_addanother' in request.POST:
                     return redirect(request.get_full_path())
@@ -2300,7 +2289,6 @@ class VirtualChassisRemoveMemberView(PermissionRequiredMixin, GetReturnURLMixin,
 
             msg = 'Removed {} from virtual chassis {}'.format(device, device.virtual_chassis)
             messages.success(request, msg)
-            UserAction.objects.log_edit(request.user, device, msg)
 
             return redirect(self.get_return_url(request, device))
 

+ 1 - 2
netbox/extras/views.py

@@ -15,7 +15,7 @@ from utilities.forms import ConfirmationForm
 from utilities.views import BulkDeleteView, ObjectDeleteView, ObjectEditView, ObjectListView
 from . import filters
 from .forms import ObjectChangeFilterForm, ImageAttachmentForm, TagForm
-from .models import ImageAttachment, ObjectChange, ReportResult, UserAction
+from .models import ImageAttachment, ObjectChange, ReportResult
 from .reports import get_report, get_reports
 from .tables import ObjectChangeTable, TagTable
 
@@ -223,6 +223,5 @@ class ReportRunView(PermissionRequiredMixin, View):
             result = 'failed' if report.failed else 'passed'
             msg = "Ran report {} ({})".format(report.full_name, result)
             messages.success(request, mark_safe(msg))
-            UserAction.objects.log_create(request.user, report.result, msg)
 
         return redirect('extras:report', name=report.full_name)

+ 1 - 11
netbox/utilities/views.py

@@ -19,7 +19,7 @@ from django.utils.safestring import mark_safe
 from django.views.generic import View
 from django_tables2 import RequestConfig
 
-from extras.models import CustomField, CustomFieldValue, ExportTemplate, UserAction
+from extras.models import CustomField, CustomFieldValue, ExportTemplate
 from extras.webhooks import bulk_operation_signal
 from utilities.utils import queryset_to_csv
 from utilities.forms import BootstrapMixin, CSVDataField
@@ -213,11 +213,6 @@ class ObjectEditView(GetReturnURLMixin, View):
                 msg = '{} {}'.format(msg, escape(obj))
             messages.success(request, mark_safe(msg))
 
-            if obj_created:
-                UserAction.objects.log_create(request.user, obj, msg)
-            else:
-                UserAction.objects.log_edit(request.user, obj, msg)
-
             if '_addanother' in request.POST:
                 return redirect(request.get_full_path())
 
@@ -279,7 +274,6 @@ class ObjectDeleteView(GetReturnURLMixin, View):
 
             msg = 'Deleted {} {}'.format(self.model._meta.verbose_name, obj)
             messages.success(request, msg)
-            UserAction.objects.log_delete(request.user, obj, msg)
 
             return_url = form.cleaned_data.get('return_url')
             if return_url is not None and is_safe_url(url=return_url, host=request.get_host()):
@@ -365,7 +359,6 @@ class BulkCreateView(View):
                     # If we make it to this point, validation has succeeded on all new objects.
                     msg = "Added {} {}".format(len(new_objs), model._meta.verbose_name_plural)
                     messages.success(request, msg)
-                    UserAction.objects.log_bulk_create(request.user, ContentType.objects.get_for_model(model), msg)
 
                     if '_addanother' in request.POST:
                         return redirect(request.path)
@@ -450,7 +443,6 @@ class BulkImportView(View):
                 if new_objs:
                     msg = 'Imported {} {}'.format(len(new_objs), new_objs[0]._meta.verbose_name_plural)
                     messages.success(request, msg)
-                    UserAction.objects.log_import(request.user, ContentType.objects.get_for_model(new_objs[0]), msg)
 
                     return render(request, "import_success.html", {
                         'table': obj_table,
@@ -566,7 +558,6 @@ class BulkEditView(View):
                     if updated_count:
                         msg = 'Updated {} {}'.format(updated_count, self.cls._meta.verbose_name_plural)
                         messages.success(self.request, msg)
-                        UserAction.objects.log_bulk_edit(request.user, ContentType.objects.get_for_model(self.cls), msg)
 
                     return redirect(return_url)
 
@@ -661,7 +652,6 @@ class BulkDeleteView(View):
 
                 msg = 'Deleted {} {}'.format(deleted_count, self.cls._meta.verbose_name_plural)
                 messages.success(request, msg)
-                UserAction.objects.log_bulk_delete(request.user, ContentType.objects.get_for_model(self.cls), msg)
                 return redirect(return_url)
 
         else: