From 668e871e4fd52abb20426b8dafa988c423d3d3a7 Mon Sep 17 00:00:00 2001 From: Jon Date: Sat, 25 May 2024 19:30:01 +0930 Subject: [PATCH] refactor(itam): relocation item delete from list to inside device !11 #23 --- app/itam/templates/itam/device_index.html.j2 | 2 +- .../itam/operating_system_index.html.j2 | 2 +- .../templates/itam/software_index.html.j2 | 2 +- app/itam/views/device.py | 3 +++ app/itam/views/device_model.py | 3 +++ app/itam/views/device_type.py | 3 +++ app/itam/views/operating_system.py | 1 + app/itam/views/software.py | 3 +++ app/itam/views/software_category.py | 25 +++---------------- .../templates/settings/device_models.html.j2 | 2 +- .../templates/settings/device_types.html.j2 | 2 +- .../templates/settings/manufacturers.html.j2 | 2 +- .../settings/software_categories.html.j2 | 2 +- app/settings/views/manufacturer.py | 4 +++ 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/app/itam/templates/itam/device_index.html.j2 b/app/itam/templates/itam/device_index.html.j2 index bb3e3163..388ee773 100644 --- a/app/itam/templates/itam/device_index.html.j2 +++ b/app/itam/templates/itam/device_index.html.j2 @@ -40,7 +40,7 @@ {% endif %} {% if software.is_global %}Global{% else %}{{ device.organization }}{% endif %} - Delete +   {% endfor %} diff --git a/app/itam/templates/itam/operating_system_index.html.j2 b/app/itam/templates/itam/operating_system_index.html.j2 index 63891321..1ee2eec8 100644 --- a/app/itam/templates/itam/operating_system_index.html.j2 +++ b/app/itam/templates/itam/operating_system_index.html.j2 @@ -24,7 +24,7 @@ {% endif %} {% if operating_system.is_global %}Global{% else %}{{ operating_system.organization }}{% endif %} - Delete +   {% endfor %} diff --git a/app/itam/templates/itam/software_index.html.j2 b/app/itam/templates/itam/software_index.html.j2 index f296a9d2..196c5dd1 100644 --- a/app/itam/templates/itam/software_index.html.j2 +++ b/app/itam/templates/itam/software_index.html.j2 @@ -26,7 +26,7 @@ {{ software.category }} {% if software.is_global %}Global{% else %}{{ software.organization }}{% endif %} - Delete +   {% endfor %} diff --git a/app/itam/views/device.py b/app/itam/views/device.py index 9aade0df..3f362aa7 100644 --- a/app/itam/views/device.py +++ b/app/itam/views/device.py @@ -4,6 +4,7 @@ import markdown from django.contrib.auth.mixins import PermissionRequiredMixin from django.db.models import Q from django.http import HttpResponseRedirect +from django.urls import reverse from django.views import generic from access.mixin import OrganizationPermission @@ -100,6 +101,8 @@ class View(OrganizationPermission, generic.UpdateView): context['model_pk'] = self.kwargs['pk'] context['model_name'] = self.model._meta.verbose_name.replace(' ', '') + context['model_delete_url'] = reverse('ITAM:_device_delete', args=(self.kwargs['pk'],)) + context['content_title'] = self.object.name return context diff --git a/app/itam/views/device_model.py b/app/itam/views/device_model.py index 12891f53..a55b9d89 100644 --- a/app/itam/views/device_model.py +++ b/app/itam/views/device_model.py @@ -1,4 +1,5 @@ from django.contrib.auth.mixins import PermissionRequiredMixin +from django.urls import reverse from django.views import generic from access.mixin import OrganizationPermission @@ -33,6 +34,8 @@ class View(OrganizationPermission, generic.UpdateView): context['model_pk'] = self.kwargs['pk'] context['model_name'] = self.model._meta.verbose_name.replace(' ', '') + context['model_delete_url'] = reverse('Settings:_device_model_delete', args=(self.kwargs['pk'],)) + context['content_title'] = self.object.name return context diff --git a/app/itam/views/device_type.py b/app/itam/views/device_type.py index 17e84a2d..3fb0eb0f 100644 --- a/app/itam/views/device_type.py +++ b/app/itam/views/device_type.py @@ -1,4 +1,5 @@ from django.contrib.auth.mixins import PermissionRequiredMixin +from django.urls import reverse from django.views import generic from access.mixin import OrganizationPermission @@ -30,6 +31,8 @@ class View(OrganizationPermission, generic.UpdateView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) + context['model_delete_url'] = reverse('Settings:_device_type_delete', args=(self.kwargs['pk'],)) + context['content_title'] = self.object.name return context diff --git a/app/itam/views/operating_system.py b/app/itam/views/operating_system.py index 9982a6b1..70dd52cb 100644 --- a/app/itam/views/operating_system.py +++ b/app/itam/views/operating_system.py @@ -62,6 +62,7 @@ class View(OrganizationPermission, generic.UpdateView): context['model_pk'] = self.kwargs['pk'] context['model_name'] = self.model._meta.verbose_name.replace(' ', '') + context['model_delete_url'] = reverse('ITAM:_operating_system_delete', args=(self.kwargs['pk'],)) context['content_title'] = self.object.name diff --git a/app/itam/views/software.py b/app/itam/views/software.py index 63a71cba..dd2aacc4 100644 --- a/app/itam/views/software.py +++ b/app/itam/views/software.py @@ -1,5 +1,6 @@ from django.contrib.auth.mixins import PermissionRequiredMixin from django.db.models import Count, Q +from django.urls import reverse from django.views import generic from access.mixin import OrganizationPermission @@ -65,6 +66,8 @@ class View(OrganizationPermission, generic.UpdateView): context['model_pk'] = self.kwargs['pk'] context['model_name'] = self.model._meta.verbose_name.replace(' ', '') + context['model_delete_url'] = reverse('ITAM:_software_delete', args=(self.kwargs['pk'],)) + context['content_title'] = self.object.name if self.request.user.is_superuser: diff --git a/app/itam/views/software_category.py b/app/itam/views/software_category.py index 895447c0..9f1dc2d0 100644 --- a/app/itam/views/software_category.py +++ b/app/itam/views/software_category.py @@ -1,4 +1,5 @@ from django.contrib.auth.mixins import PermissionRequiredMixin +from django.urls import reverse from django.views import generic from access.mixin import OrganizationPermission @@ -8,28 +9,8 @@ from ..models.software import Software, SoftwareCategory from settings.models.user_settings import UserSettings - -class IndexView(PermissionRequiredMixin, OrganizationPermission, generic.ListView): - model = Software - permission_required = 'itam.view_software' - template_name = 'itam/software_index.html.j2' - context_object_name = "softwares" - - - def get_queryset(self): - - if self.request.user.is_superuser: - - return Software.objects.filter().order_by('name') - - else: - - return Software.objects.filter(organization=self.user_organizations()).order_by('name') - - - class View(OrganizationPermission, generic.UpdateView): - model = Software + model = SoftwareCategory permission_required = [ 'itam.view_software' ] @@ -48,6 +29,8 @@ class View(OrganizationPermission, generic.UpdateView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) + context['model_delete_url'] = reverse('Settings:_software_category_delete', args=(self.kwargs['pk'],)) + context['content_title'] = self.object.name return context diff --git a/app/settings/templates/settings/device_models.html.j2 b/app/settings/templates/settings/device_models.html.j2 index cefa54e9..0d787b74 100644 --- a/app/settings/templates/settings/device_models.html.j2 +++ b/app/settings/templates/settings/device_models.html.j2 @@ -19,7 +19,7 @@ {{ item.name }} {{ item.manufacturer }} {% if item.is_global %}Global{% else %}{{ item.organization }}{% endif %} - Delete +   {% endfor %} diff --git a/app/settings/templates/settings/device_types.html.j2 b/app/settings/templates/settings/device_types.html.j2 index 1f0a04c9..65b03949 100644 --- a/app/settings/templates/settings/device_types.html.j2 +++ b/app/settings/templates/settings/device_types.html.j2 @@ -17,7 +17,7 @@ {{ item.name }} {% if item.is_global %}Global{% else %}{{ item.organization }}{% endif %} - Delete +   {% endfor %} diff --git a/app/settings/templates/settings/manufacturers.html.j2 b/app/settings/templates/settings/manufacturers.html.j2 index 50bb3861..2cc28e0d 100644 --- a/app/settings/templates/settings/manufacturers.html.j2 +++ b/app/settings/templates/settings/manufacturers.html.j2 @@ -17,7 +17,7 @@ {{ item.name }} {% if item.is_global %}Global{% else %}{{ item.organization }}{% endif %} - Delete +   {% endfor %} diff --git a/app/settings/templates/settings/software_categories.html.j2 b/app/settings/templates/settings/software_categories.html.j2 index 16553c29..24840791 100644 --- a/app/settings/templates/settings/software_categories.html.j2 +++ b/app/settings/templates/settings/software_categories.html.j2 @@ -18,7 +18,7 @@ {{ item.name }} {% if item.is_global %}Global{% else %}{{ item.organization }}{% endif %} - Delete +   {% endfor %} diff --git a/app/settings/views/manufacturer.py b/app/settings/views/manufacturer.py index fdca9776..4842bb9c 100644 --- a/app/settings/views/manufacturer.py +++ b/app/settings/views/manufacturer.py @@ -1,5 +1,6 @@ from django.contrib.auth.mixins import PermissionRequiredMixin from django.db.models import Q +from django.urls import reverse from django.views import generic @@ -69,6 +70,8 @@ class View(OrganizationPermission, generic.UpdateView): context['model_pk'] = self.kwargs['pk'] context['model_name'] = self.model._meta.verbose_name.replace(' ', '') + context['model_delete_url'] = reverse('Settings:_manufacturer_delete', args=(self.kwargs['pk'],)) + context['content_title'] = self.object.name return context @@ -117,6 +120,7 @@ class Delete(PermissionRequiredMixin, OrganizationPermission, generic.DeleteView 'access.delete_manufacturer', ] + template_name = 'form.html.j2' def get_success_url(self, **kwargs):