nofusscomputing/centurion_erp
1
0
Fork 0
Code Issues Wiki Activity

refactor(itam): relocation item delete from list to inside device

Browse Source 
!11 #23
This commit is contained in:
Jon Lockwood
2024-05-25 19:30:01 +09:30
parent b2f7c83155
commit 668e871e4f
14 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/itam/templates/itam/device_index.html.j2
View File

@ -40,7 +40,7 @@
{% endif %}
</td>
<td>{% if software.is_global %}Global{% else %}{{ device.organization }}{% endif %}</td>
<td><a href="{% url 'ITAM:_device_delete' pk=device.id %}">Delete</a></td>
<td>&nbsp;</td>
</tr>
{% endfor %}

2
app/itam/templates/itam/operating_system_index.html.j2
View File

@ -24,7 +24,7 @@
{% endif %}
</td>
<td>{% if operating_system.is_global %}Global{% else %}{{ operating_system.organization }}{% endif %}</td>
<td><a href="{% url 'ITAM:_operating_system_delete' pk=operating_system.id %}">Delete</a></td>
<td>&nbsp;</td>
</tr>
{% endfor %}

2
app/itam/templates/itam/software_index.html.j2
View File

@ -26,7 +26,7 @@
</td>
<td>{{ software.category }}</td>
<td>{% if software.is_global %}Global{% else %}{{ software.organization }}{% endif %}</td>
<td><a href="{% url 'ITAM:_software_delete' pk=software.id %}">Delete</a></td>
<td>&nbsp;</td>
</tr>
{% endfor %}

3
app/itam/views/device.py
View File

@ -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

3
app/itam/views/device_model.py
View File

@ -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

3
app/itam/views/device_type.py
View File

@ -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

1
app/itam/views/operating_system.py
View File

@ -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

3
app/itam/views/software.py
View File

@ -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:

25
app/itam/views/software_category.py
View File

@ -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

2
app/settings/templates/settings/device_models.html.j2
View File

@ -19,7 +19,7 @@
<td><a href="{% url 'Settings:_device_model_view' pk=item.id %}">{{ item.name }}</a></td>
<td>{{ item.manufacturer }}</td>
<td>{% if item.is_global %}Global{% else %}{{ item.organization }}{% endif %}</td>
<td><a href="{% url 'Settings:_device_model_delete' pk=item.id %}">Delete</a></td>
<td>&nbsp;</td>
</tr>
{% endfor %}

2
app/settings/templates/settings/device_types.html.j2
View File

@ -17,7 +17,7 @@
<tr>
<td><a href="{% url 'Settings:_device_type_view' pk=item.id %}">{{ item.name }}</a></td>
<td>{% if item.is_global %}Global{% else %}{{ item.organization }}{% endif %}</td>
<td><a href="{% url 'Settings:_device_type_delete' pk=item.id %}">Delete</a></td>
<td>&nbsp;</td>
</tr>
{% endfor %}

2
app/settings/templates/settings/manufacturers.html.j2
View File

@ -17,7 +17,7 @@
<tr>
<td><a href="{% url 'Settings:_manufacturer_view' pk=item.id %}">{{ item.name }}</a></td>
<td>{% if item.is_global %}Global{% else %}{{ item.organization }}{% endif %}</td>
<td><a href="{% url 'Settings:_manufacturer_delete' pk=item.id %}">Delete</a></td>
<td>&nbsp;</td>
</tr>
{% endfor %}

2
app/settings/templates/settings/software_categories.html.j2
View File

@ -18,7 +18,7 @@
<tr>
<td><a href="{% url 'Settings:_software_category_view' pk=item.id %}">{{ item.name }}</a></td>
<td>{% if item.is_global %}Global{% else %}{{ item.organization }}{% endif %}</td>
<td><a href="{% url 'Settings:_software_category_delete' pk=item.id %}">Delete</a></td>
<td>&nbsp;</td>
</tr>
{% endfor %}

4
app/settings/views/manufacturer.py
View File

@ -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):