diff --git a/customers/views.py b/customers/views.py index 24eff63..51bc10f 100644 --- a/customers/views.py +++ b/customers/views.py @@ -18,10 +18,10 @@ def customers_table_view(request): 'customers.view_customer', klass=Customer)) RequestConfig(request).configure(table) - return render(request, 'inventory/customer_list.html', {'customers': table}) + return render(request, 'customers/customer_list.html', {'customers': table}) class CustomerDetailView(LoginRequiredMixin, PermissionRequiredMixin, DetailView): model = Customer - template_name = 'inventory/customer_details.html' + template_name = 'customers/customer_details.html' permission_required = 'view_customer' diff --git a/devices/views.py b/devices/views.py index 11ad91f..74d3541 100644 --- a/devices/views.py +++ b/devices/views.py @@ -16,7 +16,7 @@ from .tables import DevicesTable @device_view_permission def device_detail_view(request, pk): device = get_object_or_404(Device, pk=pk) - return render(request, 'inventory/device_details.html', + return render(request, 'devices/device_details.html', {'device': device}) @@ -25,4 +25,4 @@ def device_detail_view(request, pk): def devices_table_view(request, pk): table = DevicesTable(Device.objects.filter(customer=pk)) RequestConfig(request).configure(table) - return render(request, 'inventory/device_list.html', {'devices': table}) + return render(request, 'devices/device_list.html', {'devices': table}) diff --git a/nets/views.py b/nets/views.py index 44cc420..38e3e05 100644 --- a/nets/views.py +++ b/nets/views.py @@ -18,7 +18,7 @@ from .tables import NetsTable def nets_table_view(request, pk): table = NetsTable(Net.objects.filter(customer=pk)) RequestConfig(request).configure(table) - return render(request, 'inventory/net_list.html', {'nets': table}) + return render(request, 'nets/net_list.html', {'nets': table}) @login_required @@ -27,6 +27,6 @@ def net_detail_view(request, pk): net = get_object_or_404(Net, pk=pk) table = NetDetailTable(DeviceInNet.objects.filter(net=net)) RequestConfig(request).configure(table) - return render(request, 'inventory/net_details.html', + return render(request, 'nets/net_details.html', {'table': table, 'net': net}) diff --git a/users/views.py b/users/views.py index da25b21..db9898b 100644 --- a/users/views.py +++ b/users/views.py @@ -20,7 +20,7 @@ from .tables import UsersTable def users_table_view(request, pk): table = UsersTable(User.objects.filter(customer=pk)) RequestConfig(request).configure(table) - return render(request, 'inventory/user_list.html', {'users': table}) + return render(request, 'users/user_list.html', {'users': table}) @login_required @@ -32,7 +32,7 @@ def user_detail_view(request, pk): mail_alias = MailAlias.objects.filter(user=user) computers = Computer.objects.filter(user=user) licenses = LicenseWithUser.objects.filter(user=user) - return render(request, 'inventory/user_details.html', + return render(request, 'users/user_details.html', {'user': user, 'ad_groups': ad_groups, 'mail_groups': mail_groups,