From 91672e8128e3ff93f377e4accb2565a6c66b9a30 Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Thu, 25 Jul 2019 20:35:22 +0200 Subject: [PATCH] rename the views for better clarity --- network_inventory/inventory/urls.py | 9 +++++---- network_inventory/inventory/views.py | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/network_inventory/inventory/urls.py b/network_inventory/inventory/urls.py index 3bc8438..a1f624d 100644 --- a/network_inventory/inventory/urls.py +++ b/network_inventory/inventory/urls.py @@ -3,14 +3,15 @@ from django.urls import path from . import views urlpatterns = [ - path('', views.CustomerList.as_view(), name='customers'), + path('', views.CustomerListView.as_view(), name='customers'), path('customer//', views.CustomerDetailView.as_view(), name='customer'), + path('customer//computers', views.ComputerListView.as_view(), name='computers'), - path('device//', views.device_details, name='device'), - path('computer//', views.computer_details, + path('device//', views.device_detail_view, name='device'), + path('computer//', views.computer_detail_view, name='computer'), - path('devices/', views.DeviceList.as_view(), + path('devices/', views.DeviceListView.as_view(), name='devices'), path('customer//lists/', views.list_of_lists, name='lists'), diff --git a/network_inventory/inventory/views.py b/network_inventory/inventory/views.py index 29af267..770ee6e 100644 --- a/network_inventory/inventory/views.py +++ b/network_inventory/inventory/views.py @@ -8,7 +8,7 @@ from .models import (Device, Computer, ComputerRamRelation, Customer) -def device_details(request, device_id): +def device_detail_view(request, device_id): device = get_object_or_404(Device, pk=device_id) return render(request, 'inventory/device_details.html', {'device': device}) @@ -16,7 +16,7 @@ def device_details(request, device_id): @login_required @computer_view_permission -def computer_details(request, computer_id): +def computer_detail_view(request, computer_id): computer = get_object_or_404(Computer, pk=computer_id) disks_list = ComputerDiskRelation.objects.filter(computer=computer_id) ram_list = ComputerRamRelation.objects.filter(computer=computer_id) @@ -49,7 +49,7 @@ class CustomerListView(ListView): return queryset -class ComputerList(ListView): +class ComputerListView(ListView): model = Computer template_name = 'inventory/computer_list.html' @@ -58,7 +58,7 @@ class ComputerList(ListView): return queryset -class DeviceList(ListView): +class DeviceListView(ListView): model = Device context_object_name = 'device_list' template_name = 'inventory/device_list.html'