From 3c2e0b0b173dc50ad50fd504a1e923dd1e3c3063 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 14 Jun 2018 16:15:14 -0400 Subject: [PATCH] Added changelog views --- netbox/circuits/urls.py | 5 + netbox/dcim/urls.py | 19 +- netbox/extras/admin.py | 4 +- netbox/extras/models.py | 5 + netbox/extras/views.py | 39 +++- netbox/ipam/urls.py | 11 ++ netbox/secrets/urls.py | 4 + netbox/templates/circuits/circuit.html | 87 +++++---- netbox/templates/circuits/provider.html | 97 +++++----- netbox/templates/dcim/device.html | 11 +- netbox/templates/dcim/devicetype.html | 67 ++++--- netbox/templates/dcim/rack.html | 93 +++++----- netbox/templates/dcim/site.html | 106 ++++++----- netbox/templates/extras/changelog.html | 36 ++++ netbox/templates/ipam/aggregate.html | 85 +++++---- netbox/templates/ipam/ipaddress.html | 89 +++++---- netbox/templates/ipam/prefix.html | 15 +- netbox/templates/ipam/vlan.html | 11 +- netbox/templates/ipam/vrf.html | 83 +++++---- netbox/templates/secrets/secret.html | 61 +++--- netbox/templates/tenancy/tenant.html | 89 +++++---- netbox/templates/virtualization/cluster.html | 89 +++++---- .../virtualization/virtualmachine.html | 173 ++++++++++-------- netbox/tenancy/urls.py | 4 + netbox/virtualization/urls.py | 6 + netbox/virtualization/views.py | 8 +- 26 files changed, 790 insertions(+), 507 deletions(-) create mode 100644 netbox/templates/extras/changelog.html diff --git a/netbox/circuits/urls.py b/netbox/circuits/urls.py index 569c1eb9a..6b5529a42 100644 --- a/netbox/circuits/urls.py +++ b/netbox/circuits/urls.py @@ -2,7 +2,9 @@ from __future__ import unicode_literals from django.conf.urls import url +from extras.views import ChangeLogView from . import views +from .models import Circuit, CircuitType, Provider app_name = 'circuits' urlpatterns = [ @@ -16,6 +18,7 @@ urlpatterns = [ url(r'^providers/(?P[\w-]+)/$', views.ProviderView.as_view(), name='provider'), url(r'^providers/(?P[\w-]+)/edit/$', views.ProviderEditView.as_view(), name='provider_edit'), url(r'^providers/(?P[\w-]+)/delete/$', views.ProviderDeleteView.as_view(), name='provider_delete'), + url(r'^providers/(?P[\w-]+)/changelog/$', ChangeLogView.as_view(), name='provider_changelog', kwargs={'model': Provider}), # Circuit types url(r'^circuit-types/$', views.CircuitTypeListView.as_view(), name='circuittype_list'), @@ -23,6 +26,7 @@ urlpatterns = [ url(r'^circuit-types/import/$', views.CircuitTypeBulkImportView.as_view(), name='circuittype_import'), url(r'^circuit-types/delete/$', views.CircuitTypeBulkDeleteView.as_view(), name='circuittype_bulk_delete'), url(r'^circuit-types/(?P[\w-]+)/edit/$', views.CircuitTypeEditView.as_view(), name='circuittype_edit'), + url(r'^circuit-types/(?P[\w-]+)/changelog/$', ChangeLogView.as_view(), name='circuittype_changelog', kwargs={'model': CircuitType}), # Circuits url(r'^circuits/$', views.CircuitListView.as_view(), name='circuit_list'), @@ -33,6 +37,7 @@ urlpatterns = [ url(r'^circuits/(?P\d+)/$', views.CircuitView.as_view(), name='circuit'), url(r'^circuits/(?P\d+)/edit/$', views.CircuitEditView.as_view(), name='circuit_edit'), url(r'^circuits/(?P\d+)/delete/$', views.CircuitDeleteView.as_view(), name='circuit_delete'), + url(r'^circuits/(?P\d+)/changelog/$', ChangeLogView.as_view(), name='circuit_changelog', kwargs={'model': Circuit}), url(r'^circuits/(?P\d+)/terminations/swap/$', views.circuit_terminations_swap, name='circuit_terminations_swap'), # Circuit terminations diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py index 5682bd8e7..67e957f9b 100644 --- a/netbox/dcim/urls.py +++ b/netbox/dcim/urls.py @@ -2,11 +2,14 @@ from __future__ import unicode_literals from django.conf.urls import url -from extras.views import ImageAttachmentEditView +from extras.views import ChangeLogView, ImageAttachmentEditView from ipam.views import ServiceCreateView from secrets.views import secret_add from . import views -from .models import Device, Rack, Site +from .models import ( + Device, DeviceRole, DeviceType, Manufacturer, Platform, Rack, RackGroup, RackReservation, RackRole, Region, Site, + VirtualChassis, +) app_name = 'dcim' urlpatterns = [ @@ -17,6 +20,7 @@ urlpatterns = [ url(r'^regions/import/$', views.RegionBulkImportView.as_view(), name='region_import'), url(r'^regions/delete/$', views.RegionBulkDeleteView.as_view(), name='region_bulk_delete'), url(r'^regions/(?P\d+)/edit/$', views.RegionEditView.as_view(), name='region_edit'), + url(r'^regions/(?P\d+)/changelog/$', ChangeLogView.as_view(), name='region_changelog', kwargs={'model': Region}), # Sites url(r'^sites/$', views.SiteListView.as_view(), name='site_list'), @@ -26,6 +30,7 @@ urlpatterns = [ url(r'^sites/(?P[\w-]+)/$', views.SiteView.as_view(), name='site'), url(r'^sites/(?P[\w-]+)/edit/$', views.SiteEditView.as_view(), name='site_edit'), url(r'^sites/(?P[\w-]+)/delete/$', views.SiteDeleteView.as_view(), name='site_delete'), + url(r'^sites/(?P[\w-]+)/changelog/$', ChangeLogView.as_view(), name='site_changelog', kwargs={'model': Site}), url(r'^sites/(?P\d+)/images/add/$', ImageAttachmentEditView.as_view(), name='site_add_image', kwargs={'model': Site}), # Rack groups @@ -34,6 +39,7 @@ urlpatterns = [ url(r'^rack-groups/import/$', views.RackGroupBulkImportView.as_view(), name='rackgroup_import'), url(r'^rack-groups/delete/$', views.RackGroupBulkDeleteView.as_view(), name='rackgroup_bulk_delete'), url(r'^rack-groups/(?P\d+)/edit/$', views.RackGroupEditView.as_view(), name='rackgroup_edit'), + url(r'^rack-groups/(?P\d+)/changelog/$', ChangeLogView.as_view(), name='rackgroup_changelog', kwargs={'model': RackGroup}), # Rack roles url(r'^rack-roles/$', views.RackRoleListView.as_view(), name='rackrole_list'), @@ -41,6 +47,7 @@ urlpatterns = [ url(r'^rack-roles/import/$', views.RackRoleBulkImportView.as_view(), name='rackrole_import'), url(r'^rack-roles/delete/$', views.RackRoleBulkDeleteView.as_view(), name='rackrole_bulk_delete'), url(r'^rack-roles/(?P\d+)/edit/$', views.RackRoleEditView.as_view(), name='rackrole_edit'), + url(r'^rack-roles/(?P\d+)/changelog/$', ChangeLogView.as_view(), name='rackrole_changelog', kwargs={'model': RackRole}), # Rack reservations url(r'^rack-reservations/$', views.RackReservationListView.as_view(), name='rackreservation_list'), @@ -48,6 +55,7 @@ urlpatterns = [ url(r'^rack-reservations/delete/$', views.RackReservationBulkDeleteView.as_view(), name='rackreservation_bulk_delete'), url(r'^rack-reservations/(?P\d+)/edit/$', views.RackReservationEditView.as_view(), name='rackreservation_edit'), url(r'^rack-reservations/(?P\d+)/delete/$', views.RackReservationDeleteView.as_view(), name='rackreservation_delete'), + url(r'^rack-reservations/(?P\d+)/changelog/$', ChangeLogView.as_view(), name='rackreservation_changelog', kwargs={'model': RackReservation}), # Racks url(r'^racks/$', views.RackListView.as_view(), name='rack_list'), @@ -59,6 +67,7 @@ urlpatterns = [ url(r'^racks/(?P\d+)/$', views.RackView.as_view(), name='rack'), url(r'^racks/(?P\d+)/edit/$', views.RackEditView.as_view(), name='rack_edit'), url(r'^racks/(?P\d+)/delete/$', views.RackDeleteView.as_view(), name='rack_delete'), + url(r'^racks/(?P\d+)/changelog/$', ChangeLogView.as_view(), name='rack_changelog', kwargs={'model': Rack}), url(r'^racks/(?P\d+)/reservations/add/$', views.RackReservationCreateView.as_view(), name='rack_add_reservation'), url(r'^racks/(?P\d+)/images/add/$', ImageAttachmentEditView.as_view(), name='rack_add_image', kwargs={'model': Rack}), @@ -68,6 +77,7 @@ urlpatterns = [ url(r'^manufacturers/import/$', views.ManufacturerBulkImportView.as_view(), name='manufacturer_import'), url(r'^manufacturers/delete/$', views.ManufacturerBulkDeleteView.as_view(), name='manufacturer_bulk_delete'), url(r'^manufacturers/(?P[\w-]+)/edit/$', views.ManufacturerEditView.as_view(), name='manufacturer_edit'), + url(r'^manufacturers/(?P[\w-]+)/changelog/$', ChangeLogView.as_view(), name='manufacturer_changelog', kwargs={'model': Manufacturer}), # Device types url(r'^device-types/$', views.DeviceTypeListView.as_view(), name='devicetype_list'), @@ -78,6 +88,7 @@ urlpatterns = [ url(r'^device-types/(?P\d+)/$', views.DeviceTypeView.as_view(), name='devicetype'), url(r'^device-types/(?P\d+)/edit/$', views.DeviceTypeEditView.as_view(), name='devicetype_edit'), url(r'^device-types/(?P\d+)/delete/$', views.DeviceTypeDeleteView.as_view(), name='devicetype_delete'), + url(r'^device-types/(?P\d+)/changelog/$', ChangeLogView.as_view(), name='devicetype_changelog', kwargs={'model': DeviceType}), # Console port templates url(r'^device-types/(?P\d+)/console-ports/add/$', views.ConsolePortTemplateCreateView.as_view(), name='devicetype_add_consoleport'), @@ -110,6 +121,7 @@ urlpatterns = [ url(r'^device-roles/import/$', views.DeviceRoleBulkImportView.as_view(), name='devicerole_import'), url(r'^device-roles/delete/$', views.DeviceRoleBulkDeleteView.as_view(), name='devicerole_bulk_delete'), url(r'^device-roles/(?P[\w-]+)/edit/$', views.DeviceRoleEditView.as_view(), name='devicerole_edit'), + url(r'^device-roles/(?P[\w-]+)/changelog/$', ChangeLogView.as_view(), name='devicerole_changelog', kwargs={'model': DeviceRole}), # Platforms url(r'^platforms/$', views.PlatformListView.as_view(), name='platform_list'), @@ -117,6 +129,7 @@ urlpatterns = [ url(r'^platforms/import/$', views.PlatformBulkImportView.as_view(), name='platform_import'), url(r'^platforms/delete/$', views.PlatformBulkDeleteView.as_view(), name='platform_bulk_delete'), url(r'^platforms/(?P[\w-]+)/edit/$', views.PlatformEditView.as_view(), name='platform_edit'), + url(r'^platforms/(?P[\w-]+)/changelog/$', ChangeLogView.as_view(), name='platform_changelog', kwargs={'model': Platform}), # Devices url(r'^devices/$', views.DeviceListView.as_view(), name='device_list'), @@ -128,6 +141,7 @@ urlpatterns = [ url(r'^devices/(?P\d+)/$', views.DeviceView.as_view(), name='device'), url(r'^devices/(?P\d+)/edit/$', views.DeviceEditView.as_view(), name='device_edit'), url(r'^devices/(?P\d+)/delete/$', views.DeviceDeleteView.as_view(), name='device_delete'), + url(r'^devices/(?P\d+)/changelog/$', ChangeLogView.as_view(), name='device_changelog', kwargs={'model': Device}), url(r'^devices/(?P\d+)/inventory/$', views.DeviceInventoryView.as_view(), name='device_inventory'), url(r'^devices/(?P\d+)/status/$', views.DeviceStatusView.as_view(), name='device_status'), url(r'^devices/(?P\d+)/lldp-neighbors/$', views.DeviceLLDPNeighborsView.as_view(), name='device_lldp_neighbors'), @@ -221,6 +235,7 @@ urlpatterns = [ url(r'^virtual-chassis/add/$', views.VirtualChassisCreateView.as_view(), name='virtualchassis_add'), url(r'^virtual-chassis/(?P\d+)/edit/$', views.VirtualChassisEditView.as_view(), name='virtualchassis_edit'), url(r'^virtual-chassis/(?P\d+)/delete/$', views.VirtualChassisDeleteView.as_view(), name='virtualchassis_delete'), + url(r'^virtual-chassis/(?P\d+)/changelog/$', ChangeLogView.as_view(), name='virtualchassis_changelog', kwargs={'model': VirtualChassis}), url(r'^virtual-chassis/(?P\d+)/add-member/$', views.VirtualChassisAddMemberView.as_view(), name='virtualchassis_add_member'), url(r'^virtual-chassis-members/(?P\d+)/delete/$', views.VirtualChassisRemoveMemberView.as_view(), name='virtualchassis_remove_member'), diff --git a/netbox/extras/admin.py b/netbox/extras/admin.py index 200387f88..3da723b7d 100644 --- a/netbox/extras/admin.py +++ b/netbox/extras/admin.py @@ -132,7 +132,7 @@ class TopologyMapAdmin(admin.ModelAdmin): @admin.register(ObjectChange) class ObjectChangeAdmin(admin.ModelAdmin): actions = None - fields = ['time', 'content_type', 'display_object', 'action', 'display_user'] + fields = ['time', 'content_type', 'display_object', 'action', 'display_user', 'object_data'] list_display = ['time', 'content_type', 'display_object', 'display_action', 'display_user'] list_filter = ['time', 'action', 'user__username'] list_select_related = ['content_type', 'user'] @@ -156,7 +156,7 @@ class ObjectChangeAdmin(admin.ModelAdmin): OBJECTCHANGE_ACTION_DELETE: 'deletelink', } return mark_safe('{}'.format(icon[obj.action], obj.get_action_display())) - display_user.short_description = 'action' + display_action.short_description = 'action' def display_object(self, obj): if hasattr(obj.changed_object, 'get_absolute_url'): diff --git a/netbox/extras/models.py b/netbox/extras/models.py index e9fb2d543..759f90b4b 100644 --- a/netbox/extras/models.py +++ b/netbox/extras/models.py @@ -2,6 +2,7 @@ from __future__ import unicode_literals from collections import OrderedDict from datetime import date +import json import graphviz from django.contrib.auth.models import User @@ -720,6 +721,10 @@ class ObjectChange(models.Model): return super(ObjectChange, self).save(*args, **kwargs) + @property + def object_data_pretty(self): + return json.dumps(self.object_data, indent=4, sort_keys=True) + # # User actions diff --git a/netbox/extras/views.py b/netbox/extras/views.py index 130437356..d3dd2c3d2 100644 --- a/netbox/extras/views.py +++ b/netbox/extras/views.py @@ -1,7 +1,9 @@ from __future__ import unicode_literals +from django import template from django.contrib import messages from django.contrib.auth.mixins import PermissionRequiredMixin +from django.contrib.contenttypes.models import ContentType from django.db.models import Count from django.http import Http404 from django.shortcuts import get_object_or_404, redirect, render, reverse @@ -12,7 +14,7 @@ from taggit.models import Tag from utilities.forms import ConfirmationForm from utilities.views import BulkDeleteView, ObjectDeleteView, ObjectEditView, ObjectListView from .forms import ImageAttachmentForm, TagForm -from .models import ImageAttachment, ReportResult, UserAction +from .models import ImageAttachment, ObjectChange, ReportResult, UserAction from .reports import get_report, get_reports from .tables import TagTable @@ -50,6 +52,41 @@ class TagBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): default_return_url = 'extras:tag_list' +# +# Change logging +# + +class ChangeLogView(View): + """ + Present a history of changes made to an object. + """ + + def get(self, request, model, **kwargs): + + # Get object my model and kwargs (e.g. slug='foo') + obj = get_object_or_404(model, **kwargs) + + # Gather all changes for this object + content_type = ContentType.objects.get_for_model(model) + changes = ObjectChange.objects.filter(content_type=content_type, object_id=obj.pk) + + # Check whether a header template exists for this model + base_template = '{}/{}.html'.format(model._meta.app_label, model._meta.model_name) + try: + template.loader.get_template(base_template) + object_var = model._meta.model_name + except template.TemplateDoesNotExist: + base_template = '_base.html' + object_var = 'obj' + + return render(request, 'extras/changelog.html', { + object_var: obj, + 'changes': changes, + 'base_template': base_template, + 'active_tab': 'changelog', + }) + + # # Image attachments # diff --git a/netbox/ipam/urls.py b/netbox/ipam/urls.py index aa7c17a5c..89c30a6db 100644 --- a/netbox/ipam/urls.py +++ b/netbox/ipam/urls.py @@ -2,7 +2,9 @@ from __future__ import unicode_literals from django.conf.urls import url +from extras.views import ChangeLogView from . import views +from .models import Aggregate, IPAddress, Prefix, RIR, Role, Service, VLAN, VLANGroup, VRF app_name = 'ipam' @@ -17,6 +19,7 @@ urlpatterns = [ url(r'^vrfs/(?P\d+)/$', views.VRFView.as_view(), name='vrf'), url(r'^vrfs/(?P\d+)/edit/$', views.VRFEditView.as_view(), name='vrf_edit'), url(r'^vrfs/(?P\d+)/delete/$', views.VRFDeleteView.as_view(), name='vrf_delete'), + url(r'^vrfs/(?P\d+)/changelog/$', ChangeLogView.as_view(), name='vrf_changelog', kwargs={'model': VRF}), # RIRs url(r'^rirs/$', views.RIRListView.as_view(), name='rir_list'), @@ -24,6 +27,7 @@ urlpatterns = [ url(r'^rirs/import/$', views.RIRBulkImportView.as_view(), name='rir_import'), url(r'^rirs/delete/$', views.RIRBulkDeleteView.as_view(), name='rir_bulk_delete'), url(r'^rirs/(?P[\w-]+)/edit/$', views.RIREditView.as_view(), name='rir_edit'), + url(r'^vrfs/(?P[\w-]+)/changelog/$', ChangeLogView.as_view(), name='rir_changelog', kwargs={'model': RIR}), # Aggregates url(r'^aggregates/$', views.AggregateListView.as_view(), name='aggregate_list'), @@ -34,6 +38,7 @@ urlpatterns = [ url(r'^aggregates/(?P\d+)/$', views.AggregateView.as_view(), name='aggregate'), url(r'^aggregates/(?P\d+)/edit/$', views.AggregateEditView.as_view(), name='aggregate_edit'), url(r'^aggregates/(?P\d+)/delete/$', views.AggregateDeleteView.as_view(), name='aggregate_delete'), + url(r'^aggregates/(?P\d+)/changelog/$', ChangeLogView.as_view(), name='aggregate_changelog', kwargs={'model': Aggregate}), # Roles url(r'^roles/$', views.RoleListView.as_view(), name='role_list'), @@ -41,6 +46,7 @@ urlpatterns = [ url(r'^roles/import/$', views.RoleBulkImportView.as_view(), name='role_import'), url(r'^roles/delete/$', views.RoleBulkDeleteView.as_view(), name='role_bulk_delete'), url(r'^roles/(?P[\w-]+)/edit/$', views.RoleEditView.as_view(), name='role_edit'), + url(r'^roles/(?P[\w-]+)/changelog/$', ChangeLogView.as_view(), name='role_changelog', kwargs={'model': Role}), # Prefixes url(r'^prefixes/$', views.PrefixListView.as_view(), name='prefix_list'), @@ -51,6 +57,7 @@ urlpatterns = [ url(r'^prefixes/(?P\d+)/$', views.PrefixView.as_view(), name='prefix'), url(r'^prefixes/(?P\d+)/edit/$', views.PrefixEditView.as_view(), name='prefix_edit'), url(r'^prefixes/(?P\d+)/delete/$', views.PrefixDeleteView.as_view(), name='prefix_delete'), + url(r'^prefixes/(?P\d+)/changelog/$', ChangeLogView.as_view(), name='prefix_changelog', kwargs={'model': Prefix}), url(r'^prefixes/(?P\d+)/prefixes/$', views.PrefixPrefixesView.as_view(), name='prefix_prefixes'), url(r'^prefixes/(?P\d+)/ip-addresses/$', views.PrefixIPAddressesView.as_view(), name='prefix_ipaddresses'), @@ -61,6 +68,7 @@ urlpatterns = [ url(r'^ip-addresses/import/$', views.IPAddressBulkImportView.as_view(), name='ipaddress_import'), url(r'^ip-addresses/edit/$', views.IPAddressBulkEditView.as_view(), name='ipaddress_bulk_edit'), url(r'^ip-addresses/delete/$', views.IPAddressBulkDeleteView.as_view(), name='ipaddress_bulk_delete'), + url(r'^ip-addresses/(?P\d+)/changelog/$', ChangeLogView.as_view(), name='ipaddress_changelog', kwargs={'model': IPAddress}), url(r'^ip-addresses/assign/$', views.IPAddressAssignView.as_view(), name='ipaddress_assign'), url(r'^ip-addresses/(?P\d+)/$', views.IPAddressView.as_view(), name='ipaddress'), url(r'^ip-addresses/(?P\d+)/edit/$', views.IPAddressEditView.as_view(), name='ipaddress_edit'), @@ -72,6 +80,7 @@ urlpatterns = [ url(r'^vlan-groups/import/$', views.VLANGroupBulkImportView.as_view(), name='vlangroup_import'), url(r'^vlan-groups/delete/$', views.VLANGroupBulkDeleteView.as_view(), name='vlangroup_bulk_delete'), url(r'^vlan-groups/(?P\d+)/edit/$', views.VLANGroupEditView.as_view(), name='vlangroup_edit'), + url(r'^vlan-groups/(?P\d+)/changelog/$', ChangeLogView.as_view(), name='vlangroup_changelog', kwargs={'model': VLANGroup}), # VLANs url(r'^vlans/$', views.VLANListView.as_view(), name='vlan_list'), @@ -83,9 +92,11 @@ urlpatterns = [ url(r'^vlans/(?P\d+)/members/$', views.VLANMembersView.as_view(), name='vlan_members'), url(r'^vlans/(?P\d+)/edit/$', views.VLANEditView.as_view(), name='vlan_edit'), url(r'^vlans/(?P\d+)/delete/$', views.VLANDeleteView.as_view(), name='vlan_delete'), + url(r'^vlans/(?P\d+)/changelog/$', ChangeLogView.as_view(), name='vlan_changelog', kwargs={'model': VLAN}), # Services url(r'^services/(?P\d+)/edit/$', views.ServiceEditView.as_view(), name='service_edit'), url(r'^services/(?P\d+)/delete/$', views.ServiceDeleteView.as_view(), name='service_delete'), + url(r'^services/(?P\d+)/changelog/$', ChangeLogView.as_view(), name='service_changelog', kwargs={'model': Service}), ] diff --git a/netbox/secrets/urls.py b/netbox/secrets/urls.py index cd6415719..9c9324c4a 100644 --- a/netbox/secrets/urls.py +++ b/netbox/secrets/urls.py @@ -2,7 +2,9 @@ from __future__ import unicode_literals from django.conf.urls import url +from extras.views import ChangeLogView from . import views +from .models import Secret, SecretRole app_name = 'secrets' urlpatterns = [ @@ -13,6 +15,7 @@ urlpatterns = [ url(r'^secret-roles/import/$', views.SecretRoleBulkImportView.as_view(), name='secretrole_import'), url(r'^secret-roles/delete/$', views.SecretRoleBulkDeleteView.as_view(), name='secretrole_bulk_delete'), url(r'^secret-roles/(?P[\w-]+)/edit/$', views.SecretRoleEditView.as_view(), name='secretrole_edit'), + url(r'^secret-roles/(?P[\w-]+)/changelog/$', ChangeLogView.as_view(), name='secretrole_changelog', kwargs={'model': SecretRole}), # Secrets url(r'^secrets/$', views.SecretListView.as_view(), name='secret_list'), @@ -22,5 +25,6 @@ urlpatterns = [ url(r'^secrets/(?P\d+)/$', views.SecretView.as_view(), name='secret'), url(r'^secrets/(?P\d+)/edit/$', views.secret_edit, name='secret_edit'), url(r'^secrets/(?P\d+)/delete/$', views.SecretDeleteView.as_view(), name='secret_delete'), + url(r'^secrets/(?P\d+)/changelog/$', ChangeLogView.as_view(), name='secret_changelog', kwargs={'model': Secret}), ] diff --git a/netbox/templates/circuits/circuit.html b/netbox/templates/circuits/circuit.html index 509c6da89..048c16862 100644 --- a/netbox/templates/circuits/circuit.html +++ b/netbox/templates/circuits/circuit.html @@ -1,44 +1,57 @@ {% extends '_base.html' %} {% load helpers %} +{% block title %}{{ circuit }}{% endblock %} + +{% block header %} +
+
+
    +
  1. Circuits
    2. +
  2. {{ circuit.provider }}
    3. +
  3. {{ circuit.cid }}
    4. +
+
+
+
+
+ + + + +
+
+
+
+
+ {% if perms.circuits.change_circuit %} + + + Edit this circuit + + {% endif %} + {% if perms.circuits.delete_circuit %} + + + Delete this circuit + + {% endif %} +
+

{{ circuit }}

+ {% include 'inc/created_updated.html' with obj=circuit %} + +{% endblock %} + {% block content %} -
-
-
    -
  1. Circuits
    2. -
  2. {{ circuit.provider }}
    3. -
  3. {{ circuit.cid }}
    4. -
-
-
-
-
- - - - -
-
-
-
-
- {% if perms.circuits.change_circuit %} - - - Edit this circuit - - {% endif %} - {% if perms.circuits.delete_circuit %} - - - Delete this circuit - - {% endif %} -
-

{% block title %}{{ circuit.provider }} - {{ circuit.cid }}{% endblock %}

-{% include 'inc/created_updated.html' with obj=circuit %}
diff --git a/netbox/templates/circuits/provider.html b/netbox/templates/circuits/provider.html index e19175c7f..d2fed8647 100644 --- a/netbox/templates/circuits/provider.html +++ b/netbox/templates/circuits/provider.html @@ -2,49 +2,62 @@ {% load static from staticfiles %} {% load helpers %} +{% block title %}{{ provider }}{% endblock %} + +{% block header %} +
+
+
    +
  1. Providers
    2. +
  2. {{ provider }}
    3. +
+
+
+
+
+ + + + +
+
+
+
+
+ {% if show_graphs %} + + {% endif %} + {% if perms.circuits.change_provider %} + + + Edit this provider + + {% endif %} + {% if perms.circuits.delete_provider %} + + + Delete this provider + + {% endif %} +
+

{{ provider }}

+ {% include 'inc/created_updated.html' with obj=provider %} + +{% endblock %} + {% block content %} -
-
-
    -
  1. Providers
    2. -
  2. {{ provider }}
    3. -
-
-
-
-
- - - - -
-
-
-
-
- {% if show_graphs %} - - {% endif %} - {% if perms.circuits.change_provider %} - - - Edit this provider - - {% endif %} - {% if perms.circuits.delete_provider %} - - - Delete this provider - - {% endif %} -
-

{% block title %}{{ provider }}{% endblock %}

-{% include 'inc/created_updated.html' with obj=provider %}
diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index 0cc1e4cf8..1c1539f89 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -2,6 +2,8 @@ {% load static from staticfiles %} {% load helpers %} +{% block title %}{{ device }}{% endblock %} + {% block header %}
@@ -45,11 +47,11 @@ {% endif %}
-

{% block title %}{{ device }}{% endblock %}

+

{{ device }}

{% include 'inc/created_updated.html' with obj=device %} -
    + {% endblock %} diff --git a/netbox/templates/dcim/devicetype.html b/netbox/templates/dcim/devicetype.html index 25d33101e..151e27018 100644 --- a/netbox/templates/dcim/devicetype.html +++ b/netbox/templates/dcim/devicetype.html @@ -1,34 +1,47 @@ {% extends '_base.html' %} {% load helpers %} +{% block title %}{{ devicetype.manufacturer }} {{ devicetype.model }}{% endblock %} + +{% block header %} +
    +
    +
      +
    1. Device Types
      2. +
    2. {{ devicetype.manufacturer }}
      3. +
    3. {{ devicetype.model }}
      4. +
    +
    +
    + {% if perms.dcim.change_devicetype or perms.dcim.delete_devicetype %} +
    + {% if perms.dcim.change_devicetype %} + + + Edit this device type + + {% endif %} + {% if perms.dcim.delete_devicetype %} + + + Delete this device type + + {% endif %} +
    + {% endif %} +

    {{ devicetype.manufacturer }} {{ devicetype.model }}

    + {% include 'inc/created_updated.html' with obj=devicetype %} + +{% endblock %} + {% block content %} -
    -
    -
      -
    1. Device Types
      2. -
    2. {{ devicetype.manufacturer }}
      3. -
    3. {{ devicetype.model }}
      4. -
    -
    -
    -{% if perms.dcim.change_devicetype or perms.dcim.delete_devicetype %} -
    - {% if perms.dcim.change_devicetype %} - - - Edit this device type - - {% endif %} - {% if perms.dcim.delete_devicetype %} - - - Delete this device type - - {% endif %} -
    -{% endif %} -

    {% block title %}{{ devicetype.manufacturer }} {{ devicetype.model }}{% endblock %}

    -{% include 'inc/created_updated.html' with obj=devicetype %}
    diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html index 82348e6fe..5ff8a3259 100644 --- a/netbox/templates/dcim/rack.html +++ b/netbox/templates/dcim/rack.html @@ -1,48 +1,59 @@ {% extends '_base.html' %} {% load helpers %} +{% block header %} +
    +
    +
      +
    1. Racks
      2. +
    2. {{ rack.site }}
      3. +
    3. {{ rack }}
      4. +
    +
    +
    +
    +
    + + + + +
    +
    +
    +
    +
    + + Previous Rack + + + Next Rack + + {% if perms.dcim.change_rack %} + + Edit this rack + + {% endif %} + {% if perms.dcim.delete_rack %} + + Delete this rack + + {% endif %} +
    +

    {% block title %}Rack {{ rack }}{% endblock %}

    + {% include 'inc/created_updated.html' with obj=rack %} + +{% endblock %} + {% block content %} -
    -
    -
      -
    1. Racks
      2. -
    2. {{ rack.site }}
      3. -
    3. {{ rack }}
      4. -
    -
    -
    -
    -
    - - - - -
    -
    -
    -
    -
    - - Previous Rack - - - Next Rack - - {% if perms.dcim.change_rack %} - - Edit this rack - - {% endif %} - {% if perms.dcim.delete_rack %} - - Delete this rack - - {% endif %} -
    -

    {% block title %}Rack {{ rack }}{% endblock %}

    -{% include 'inc/created_updated.html' with obj=rack %}
    diff --git a/netbox/templates/dcim/site.html b/netbox/templates/dcim/site.html index a882d77c8..c6a5207bc 100644 --- a/netbox/templates/dcim/site.html +++ b/netbox/templates/dcim/site.html @@ -3,54 +3,66 @@ {% load tz %} {% load helpers %} +{% block header %} +
    +
    +
      +
    1. Sites
      2. + {% if site.region %} + {% for region in site.region.get_ancestors %} +
    2. {{ region }}
      3. + {% endfor %} +
    3. {{ site.region }}
      4. + {% endif %} +
    4. {{ site }}
      5. +
    +
    +
    +
    +
    + + + + +
    +
    +
    +
    +
    + {% if show_graphs %} + + {% endif %} + {% if perms.dcim.change_site %} + + + Edit this site + + {% endif %} + {% if perms.dcim.delete_site %} + + + Delete this site + + {% endif %} +
    +

    {% block title %}{{ site }}{% endblock %}

    + {% include 'inc/created_updated.html' with obj=site %} + +{% endblock %} + {% block content %} -
    -
    -
      - {% if site.region %} - {% for region in site.region.get_ancestors %} -
    1. {{ region }}
      2. - {% endfor %} -
    2. {{ site.region }}
      3. - {% endif %} -
    3. {{ site }}
      4. -
    -
    -
    -
    -
    - - - - -
    -
    -
    -
    -
    - {% if show_graphs %} - - {% endif %} - {% if perms.dcim.change_site %} - - - Edit this site - - {% endif %} - {% if perms.dcim.delete_site %} - - - Delete this site - - {% endif %} -
    -

    {% block title %}{{ site }}{% endblock %}

    -{% include 'inc/created_updated.html' with obj=site %}
    diff --git a/netbox/templates/extras/changelog.html b/netbox/templates/extras/changelog.html new file mode 100644 index 000000000..4a0235f62 --- /dev/null +++ b/netbox/templates/extras/changelog.html @@ -0,0 +1,36 @@ +{% extends base_template %} + +{% block title %}{% if obj %}{{ obj }}{% else %}{{ block.super }}{% endif %} - Changelog{% endblock %} + +{% block content %} + {% if obj %}

    {{ obj }}

    {% endif %} + + + + + + + + + + + {% for change in changes %} + + + + + + + + + + {% endfor %} + +
    TimeUserAction
    {{ change.time }}{{ change.user }}{{ change.get_action_display }} + +
    + 
    {{ change.object_data_pretty }}
    +
    +{% endblock %} diff --git a/netbox/templates/ipam/aggregate.html b/netbox/templates/ipam/aggregate.html index a7711354d..2a87ae769 100644 --- a/netbox/templates/ipam/aggregate.html +++ b/netbox/templates/ipam/aggregate.html @@ -1,44 +1,55 @@ {% extends '_base.html' %} {% load helpers %} +{% block header %} +
    +
    +
      +
    1. Aggregates
      2. +
    2. {{ aggregate.rir }}
      3. +
    3. {{ aggregate }}
      4. +
    +
    +
    +
    +
    + + + + +
    +
    +
    +
    +
    + {% if perms.ipam.change_aggregate %} + + + Edit this aggregate + + {% endif %} + {% if perms.ipam.delete_aggregate %} + + + Delete this aggregate + + {% endif %} +
    +

    {% block title %}{{ aggregate }}{% endblock %}

    + {% include 'inc/created_updated.html' with obj=aggregate %} + +{% endblock %} + {% block content %} -
    -
    -
      -
    1. Aggregates
      2. -
    2. {{ aggregate.rir }}
      3. -
    3. {{ aggregate }}
      4. -
    -
    -
    -
    -
    - - - - -
    -
    -
    -
    -
    - {% if perms.ipam.change_aggregate %} - - - Edit this aggregate - - {% endif %} - {% if perms.ipam.delete_aggregate %} - - - Delete this aggregate - - {% endif %} -
    -

    {% block title %}{{ aggregate }}{% endblock %}

    -{% include 'inc/created_updated.html' with obj=aggregate %}
    diff --git a/netbox/templates/ipam/ipaddress.html b/netbox/templates/ipam/ipaddress.html index da0fc6923..dea0d45ac 100644 --- a/netbox/templates/ipam/ipaddress.html +++ b/netbox/templates/ipam/ipaddress.html @@ -1,46 +1,57 @@ {% extends '_base.html' %} {% load helpers %} +{% block header %} +
    +
    +
      +
    1. IP Addresses
      2. + {% if ipaddress.vrf %} +
    2. {{ ipaddress.vrf }}
      3. + {% endif %} +
    3. {{ ipaddress }}
      4. +
    +
    +
    +
    +
    + + + + +
    +
    +
    +
    +
    + {% if perms.ipam.change_ipaddress %} + + + Edit this IP + + {% endif %} + {% if perms.ipam.delete_ipaddress %} + + + Delete this IP + + {% endif %} +
    +

    {% block title %}{{ ipaddress }}{% endblock %}

    + {% include 'inc/created_updated.html' with obj=ipaddress %} + +{% endblock %} + {% block content %} -
    -
    -
      -
    1. IP Addresses
      2. - {% if ipaddress.vrf %} -
    2. {{ ipaddress.vrf }}
      3. - {% endif %} -
    3. {{ ipaddress }}
      4. -
    -
    -
    -
    -
    - - - - -
    -
    -
    -
    -
    - {% if perms.ipam.change_ipaddress %} - - - Edit this IP - - {% endif %} - {% if perms.ipam.delete_ipaddress %} - - - Delete this IP - - {% endif %} -
    -

    {% block title %}{{ ipaddress }}{% endblock %}

    -{% include 'inc/created_updated.html' with obj=ipaddress %}
    diff --git a/netbox/templates/ipam/prefix.html b/netbox/templates/ipam/prefix.html index c24e02414..0dc5fc338 100644 --- a/netbox/templates/ipam/prefix.html +++ b/netbox/templates/ipam/prefix.html @@ -53,9 +53,18 @@

    {% block title %}{{ prefix }}{% endblock %}

    {% include 'inc/created_updated.html' with obj=prefix %} {% endblock %} diff --git a/netbox/templates/ipam/vlan.html b/netbox/templates/ipam/vlan.html index 76ee5f65e..26e51c9e7 100644 --- a/netbox/templates/ipam/vlan.html +++ b/netbox/templates/ipam/vlan.html @@ -45,8 +45,15 @@

    {% block title %}VLAN {{ vlan.display_name }}{% endblock %}

    {% include 'inc/created_updated.html' with obj=vlan %} {% endblock %} diff --git a/netbox/templates/ipam/vrf.html b/netbox/templates/ipam/vrf.html index fa51a18f8..b8365463b 100644 --- a/netbox/templates/ipam/vrf.html +++ b/netbox/templates/ipam/vrf.html @@ -1,43 +1,54 @@ {% extends '_base.html' %} {% load helpers %} +{% block header %} +
    +
    +
      +
    1. VRFs
      2. +
    2. {{ vrf }}
      3. +
    +
    +
    +
    +
    + + + + +
    +
    +
    +
    +
    + {% if perms.ipam.change_vrf %} + + + Edit this VRF + + {% endif %} + {% if perms.ipam.delete_vrf %} + + + Delete this VRF + + {% endif %} +
    +

    {% block title %}VRF {{ vrf }}{% endblock %}

    + {% include 'inc/created_updated.html' with obj=vrf %} + +{% endblock %} + {% block content %} -
    -
    -
      -
    1. VRFs
      2. -
    2. {{ vrf }}
      3. -
    -
    -
    -
    -
    - - - - -
    -
    -
    -
    -
    - {% if perms.ipam.change_vrf %} - - - Edit this VRF - - {% endif %} - {% if perms.ipam.delete_vrf %} - - - Delete this VRF - - {% endif %} -
    -

    {% block title %}VRF {{ vrf }}{% endblock %}

    -{% include 'inc/created_updated.html' with obj=vrf %}
    diff --git a/netbox/templates/secrets/secret.html b/netbox/templates/secrets/secret.html index 4863fdeb1..6e1175f41 100644 --- a/netbox/templates/secrets/secret.html +++ b/netbox/templates/secrets/secret.html @@ -3,32 +3,43 @@ {% load helpers %} {% load secret_helpers %} -{% block content %} -
    -
    -
      -
    1. Secrets
      2. -
    2. {{ secret.role }}
      3. -
    3. {{ secret.device }}{% if secret.name %} ({{ secret.name }}){% endif %}
      4. -
    +{% block header %} +
    +
    +
      +
    1. Secrets
      2. +
    2. {{ secret.role }}
      3. +
    3. {{ secret.device }}{% if secret.name %} ({{ secret.name }}){% endif %}
      4. +
    +
    -
    -
    - {% if perms.secrets.change_secret %} - - - Edit this secret - - {% endif %} - {% if perms.secrets.delete_secret %} - - - Delete this secret - - {% endif %} -
    -

    {% block title %}{{ secret }}{% endblock %}

    -{% include 'inc/created_updated.html' with obj=secret %} +
    + {% if perms.secrets.change_secret %} + + + Edit this secret + + {% endif %} + {% if perms.secrets.delete_secret %} + + + Delete this secret + + {% endif %} +
    +

    {% block title %}{{ secret }}{% endblock %}

    + {% include 'inc/created_updated.html' with obj=secret %} + +{% endblock %} + +{% block content %}
    diff --git a/netbox/templates/tenancy/tenant.html b/netbox/templates/tenancy/tenant.html index fbbac175a..ee1691b4d 100644 --- a/netbox/templates/tenancy/tenant.html +++ b/netbox/templates/tenancy/tenant.html @@ -1,46 +1,57 @@ {% extends '_base.html' %} {% load helpers %} +{% block header %} +
    +
    +
      +
    1. Tenants
      2. + {% if tenant.group %} +
    2. {{ tenant.group }}
      3. + {% endif %} +
    3. {{ tenant }}
      4. +
    +
    +
    +
    +
    + + + + +
    +
    +
    +
    +
    + {% if perms.tenancy.change_tenant %} + + + Edit this tenant + + {% endif %} + {% if perms.tenancy.delete_tenant %} + + + Delete this tenant + + {% endif %} +
    +

    {% block title %}{{ tenant }}{% endblock %}

    + {% include 'inc/created_updated.html' with obj=tenant %} + +{% endblock %} + {% block content %} -
    -
    -
      -
    1. Tenants
      2. - {% if tenant.group %} -
    2. {{ tenant.group }}
      3. - {% endif %} -
    3. {{ tenant }}
      4. -
    -
    -
    -
    -
    - - - - -
    -
    -
    -
    -
    - {% if perms.tenancy.change_tenant %} - - - Edit this tenant - - {% endif %} - {% if perms.tenancy.delete_tenant %} - - - Delete this tenant - - {% endif %} -
    -

    {% block title %}{{ tenant }}{% endblock %}

    -{% include 'inc/created_updated.html' with obj=tenant %}
    diff --git a/netbox/templates/virtualization/cluster.html b/netbox/templates/virtualization/cluster.html index 9b1621530..71699bafe 100644 --- a/netbox/templates/virtualization/cluster.html +++ b/netbox/templates/virtualization/cluster.html @@ -1,46 +1,57 @@ {% extends '_base.html' %} {% load helpers %} +{% block header %} +
    +
    +
      +
    1. {{ cluster.type }}
      2. + {% if cluster.group %} +
    2. {{ cluster.group }}
      3. + {% endif %} +
    3. {{ cluster }}
      4. +
    +
    +
    +
    +
    + + + + +
    +
    +
    +
    +
    + {% if perms.virtualization.change_cluster %} + + + Edit this cluster + + {% endif %} + {% if perms.dcim.delete_cluster %} + + + Delete this cluster + + {% endif %} +
    +

    {% block title %}{{ cluster }}{% endblock %}

    + {% include 'inc/created_updated.html' with obj=cluster %} + +{% endblock %} + {% block content %} -
    -
    -
      -
    1. {{ cluster.type }}
      2. - {% if cluster.group %} -
    2. {{ cluster.group }}
      3. - {% endif %} -
    3. {{ cluster }}
      4. -
    -
    -
    -
    -
    - - - - -
    -
    -
    -
    -
    - {% if perms.virtualization.change_cluster %} - - - Edit this cluster - - {% endif %} - {% if perms.dcim.delete_cluster %} - - - Delete this cluster - - {% endif %} -
    -

    {% block title %}{{ cluster }}{% endblock %}

    -{% include 'inc/created_updated.html' with obj=cluster %}
    diff --git a/netbox/templates/virtualization/virtualmachine.html b/netbox/templates/virtualization/virtualmachine.html index 3d8d0d05a..d6d594b55 100644 --- a/netbox/templates/virtualization/virtualmachine.html +++ b/netbox/templates/virtualization/virtualmachine.html @@ -1,45 +1,56 @@ {% extends '_base.html' %} {% load helpers %} +{% block header %} +
    +
    +
      + {% if virtualmachine.cluster %} +
    1. {{ virtualmachine.cluster }}
      2. + {% endif %} +
    2. {{ virtualmachine }}
      3. +
    +
    +
    +
    +
    + + + + +
    +
    +
    +
    +
    + {% if perms.virtualization.change_virtualmachine %} + + + Edit this VM + + {% endif %} + {% if perms.virtualization.delete_virtualmachine %} + + + Delete this VM + + {% endif %} +
    +

    {% block title %}{{ virtualmachine }}{% endblock %}

    + {% include 'inc/created_updated.html' with obj=virtualmachine %} + +{% endblock %} + {% block content %} -
    -
    -
      - {% if vm.cluster %} -
    1. {{ vm.cluster }}
      2. - {% endif %} -
    2. {{ vm }}
      3. -
    -
    -
    -
    -
    - - - - -
    -
    -
    -
    -
    - {% if perms.virtualization.change_virtualmachine %} - - - Edit this VM - - {% endif %} - {% if perms.virtualization.delete_virtualmachine %} - - - Delete this VM - - {% endif %} -
    -

    {% block title %}{{ vm }}{% endblock %}

    -{% include 'inc/created_updated.html' with obj=vm %}
    @@ -49,19 +60,19 @@ - +
    Name{{ vm }}{{ virtualmachine }}
    Status - {{ vm.get_status_display }} + {{ virtualmachine.get_status_display }}
    Role - {% if vm.role %} - {{ vm.role }} + {% if virtualmachine.role %} + {{ virtualmachine.role }} {% else %} None {% endif %} @@ -70,8 +81,8 @@
    Platform - {% if vm.platform %} - {{ vm.platform }} + {% if virtualmachine.platform %} + {{ virtualmachine.platform }} {% else %} None {% endif %} @@ -80,12 +91,12 @@
    Tenant - {% if vm.tenant %} - {% if vm.tenant.group %} - {{ vm.tenant.group }} + {% if virtualmachine.tenant %} + {% if virtualmachine.tenant.group %} + {{ virtualmachine.tenant.group }} {% endif %} - {{ vm.tenant }} + {{ virtualmachine.tenant }} {% else %} None {% endif %} @@ -94,12 +105,12 @@
    Primary IPv4 - {% if vm.primary_ip4 %} - {{ vm.primary_ip4.address.ip }} - {% if vm.primary_ip4.nat_inside %} - (NAT for {{ vm.primary_ip4.nat_inside.address.ip }}) - {% elif vm.primary_ip4.nat_outside %} - (NAT: {{ vm.primary_ip4.nat_outside.address.ip }}) + {% if virtualmachine.primary_ip4 %} + {{ virtualmachine.primary_ip4.address.ip }} + {% if virtualmachine.primary_ip4.nat_inside %} + (NAT for {{ virtualmachine.primary_ip4.nat_inside.address.ip }}) + {% elif virtualmachine.primary_ip4.nat_outside %} + (NAT: {{ virtualmachine.primary_ip4.nat_outside.address.ip }}) {% endif %} {% else %} N/A @@ -109,12 +120,12 @@
    Primary IPv6 - {% if vm.primary_ip6 %} - {{ vm.primary_ip6.address.ip }} - {% if vm.primary_ip6.nat_inside %} - (NAT for {{ vm.primary_ip6.nat_inside.address.ip }}) - {% elif vm.primary_ip6.nat_outside %} - (NAT: {{ vm.primary_ip6.nat_outside.address.ip }}) + {% if virtualmachine.primary_ip6 %} + {{ virtualmachine.primary_ip6.address.ip }} + {% if virtualmachine.primary_ip6.nat_inside %} + (NAT for {{ virtualmachine.primary_ip6.nat_inside.address.ip }}) + {% elif virtualmachine.primary_ip6.nat_outside %} + (NAT: {{ virtualmachine.primary_ip6.nat_outside.address.ip }}) {% endif %} {% else %} N/A @@ -124,7 +135,7 @@
    Tags - {% for tag in vm.tags.all %} + {% for tag in virtualmachine.tags.all %} {% tag 'virtualization:virtualmachine_list' tag %} {% empty %} N/A @@ -133,14 +144,14 @@
    - {% include 'inc/custom_fields_panel.html' with custom_fields=vm.get_custom_fields %} + {% include 'inc/custom_fields_panel.html' with custom_fields=virtualmachine.get_custom_fields %}
    Comments
    - {% if vm.comments %} - {{ vm.comments|gfm }} + {% if virtualmachine.comments %} + {{ virtualmachine.comments|gfm }} {% else %} None {% endif %} @@ -156,16 +167,16 @@ Cluster - {% if vm.cluster.group %} - {{ vm.cluster.group }} + {% if virtualmachine.cluster.group %} + {{ virtualmachine.cluster.group }} {% endif %} - {{ vm.cluster }} + {{ virtualmachine.cluster }} Cluster Type - {{ vm.cluster.type }} + {{ virtualmachine.cluster.type }}
    @@ -177,8 +188,8 @@ Virtual CPUs - {% if vm.vcpus %} - {{ vm.vcpus }} + {% if virtualmachine.vcpus %} + {{ virtualmachine.vcpus }} {% else %} N/A {% endif %} @@ -187,8 +198,8 @@ Memory - {% if vm.memory %} - {{ vm.memory }} MB + {% if virtualmachine.memory %} + {{ virtualmachine.memory }} MB {% else %} N/A {% endif %} @@ -197,8 +208,8 @@ Disk Space - {% if vm.disk %} - {{ vm.disk }} GB + {% if virtualmachine.disk %} + {{ virtualmachine.disk }} GB {% else %} N/A {% endif %} @@ -223,7 +234,7 @@ {% endif %} {% if perms.ipam.add_service %}
    - + Assign service
    @@ -236,7 +247,7 @@ {% if perms.dcim.change_interface or perms.dcim.delete_interface %}
    {% csrf_token %} - + {% endif %}
    @@ -264,7 +275,7 @@ {% for iface in interfaces %} - {% include 'dcim/inc/interface.html' with device=vm %} + {% include 'dcim/inc/interface.html' with device=virtualmachine %} {% empty %} — No interfaces defined — @@ -275,21 +286,21 @@ {% if perms.dcim.add_interface or perms.dcim.delete_interface %}
    {% if interfaces and perms.dcim.change_interface %} - - {% endif %} {% if interfaces and perms.dcim.delete_interface %} - {% endif %} {% if perms.dcim.add_interface %}
    - + Add interfaces
    diff --git a/netbox/tenancy/urls.py b/netbox/tenancy/urls.py index 668b194f0..9b4fadec7 100644 --- a/netbox/tenancy/urls.py +++ b/netbox/tenancy/urls.py @@ -2,7 +2,9 @@ from __future__ import unicode_literals from django.conf.urls import url +from extras.views import ChangeLogView from . import views +from .models import Tenant, TenantGroup app_name = 'tenancy' urlpatterns = [ @@ -13,6 +15,7 @@ urlpatterns = [ url(r'^tenant-groups/import/$', views.TenantGroupBulkImportView.as_view(), name='tenantgroup_import'), url(r'^tenant-groups/delete/$', views.TenantGroupBulkDeleteView.as_view(), name='tenantgroup_bulk_delete'), url(r'^tenant-groups/(?P[\w-]+)/edit/$', views.TenantGroupEditView.as_view(), name='tenantgroup_edit'), + url(r'^tenant-groups/(?P[\w-]+)/changelog/$', ChangeLogView.as_view(), name='tenantgroup_changelog', kwargs={'model': TenantGroup}), # Tenants url(r'^tenants/$', views.TenantListView.as_view(), name='tenant_list'), @@ -23,5 +26,6 @@ urlpatterns = [ url(r'^tenants/(?P[\w-]+)/$', views.TenantView.as_view(), name='tenant'), url(r'^tenants/(?P[\w-]+)/edit/$', views.TenantEditView.as_view(), name='tenant_edit'), url(r'^tenants/(?P[\w-]+)/delete/$', views.TenantDeleteView.as_view(), name='tenant_delete'), + url(r'^tenants/(?P[\w-]+)/changelog/$', ChangeLogView.as_view(), name='tenant_changelog', kwargs={'model': Tenant}), ] diff --git a/netbox/virtualization/urls.py b/netbox/virtualization/urls.py index 2ba0daff7..16aa3c17f 100644 --- a/netbox/virtualization/urls.py +++ b/netbox/virtualization/urls.py @@ -2,8 +2,10 @@ from __future__ import unicode_literals from django.conf.urls import url +from extras.views import ChangeLogView from ipam.views import ServiceCreateView from . import views +from .models import Cluster, ClusterGroup, ClusterType, VirtualMachine app_name = 'virtualization' urlpatterns = [ @@ -14,6 +16,7 @@ urlpatterns = [ url(r'^cluster-types/import/$', views.ClusterTypeBulkImportView.as_view(), name='clustertype_import'), url(r'^cluster-types/delete/$', views.ClusterTypeBulkDeleteView.as_view(), name='clustertype_bulk_delete'), url(r'^cluster-types/(?P[\w-]+)/edit/$', views.ClusterTypeEditView.as_view(), name='clustertype_edit'), + url(r'^cluster-types/(?P[\w-]+)/changelog/$', ChangeLogView.as_view(), name='clustertype_changelog', kwargs={'model': ClusterType}), # Cluster groups url(r'^cluster-groups/$', views.ClusterGroupListView.as_view(), name='clustergroup_list'), @@ -21,6 +24,7 @@ urlpatterns = [ url(r'^cluster-groups/import/$', views.ClusterGroupBulkImportView.as_view(), name='clustergroup_import'), url(r'^cluster-groups/delete/$', views.ClusterGroupBulkDeleteView.as_view(), name='clustergroup_bulk_delete'), url(r'^cluster-groups/(?P[\w-]+)/edit/$', views.ClusterGroupEditView.as_view(), name='clustergroup_edit'), + url(r'^cluster-groups/(?P[\w-]+)/changelog/$', ChangeLogView.as_view(), name='clustergroup_changelog', kwargs={'model': ClusterGroup}), # Clusters url(r'^clusters/$', views.ClusterListView.as_view(), name='cluster_list'), @@ -31,6 +35,7 @@ urlpatterns = [ url(r'^clusters/(?P\d+)/$', views.ClusterView.as_view(), name='cluster'), url(r'^clusters/(?P\d+)/edit/$', views.ClusterEditView.as_view(), name='cluster_edit'), url(r'^clusters/(?P\d+)/delete/$', views.ClusterDeleteView.as_view(), name='cluster_delete'), + url(r'^clusters/(?P\d+)/changelog/$', ChangeLogView.as_view(), name='cluster_changelog', kwargs={'model': Cluster}), url(r'^clusters/(?P\d+)/devices/add/$', views.ClusterAddDevicesView.as_view(), name='cluster_add_devices'), url(r'^clusters/(?P\d+)/devices/remove/$', views.ClusterRemoveDevicesView.as_view(), name='cluster_remove_devices'), @@ -43,6 +48,7 @@ urlpatterns = [ url(r'^virtual-machines/(?P\d+)/$', views.VirtualMachineView.as_view(), name='virtualmachine'), url(r'^virtual-machines/(?P\d+)/edit/$', views.VirtualMachineEditView.as_view(), name='virtualmachine_edit'), url(r'^virtual-machines/(?P\d+)/delete/$', views.VirtualMachineDeleteView.as_view(), name='virtualmachine_delete'), + url(r'^virtual-machines/(?P\d+)/changelog/$', ChangeLogView.as_view(), name='virtualmachine_changelog', kwargs={'model': VirtualMachine}), url(r'^virtual-machines/(?P\d+)/services/assign/$', ServiceCreateView.as_view(), name='virtualmachine_service_assign'), # VM interfaces diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py index 0cedfc26d..c3fa97f2f 100644 --- a/netbox/virtualization/views.py +++ b/netbox/virtualization/views.py @@ -258,12 +258,12 @@ class VirtualMachineView(View): def get(self, request, pk): - vm = get_object_or_404(VirtualMachine.objects.select_related('tenant__group'), pk=pk) - interfaces = Interface.objects.filter(virtual_machine=vm) - services = Service.objects.filter(virtual_machine=vm) + virtualmachine = get_object_or_404(VirtualMachine.objects.select_related('tenant__group'), pk=pk) + interfaces = Interface.objects.filter(virtual_machine=virtualmachine) + services = Service.objects.filter(virtual_machine=virtualmachine) return render(request, 'virtualization/virtualmachine.html', { - 'vm': vm, + 'virtualmachine': virtualmachine, 'interfaces': interfaces, 'services': services, })