From 6d0ec7e4481b9e7da44fc5a2ddce3e6208db4086 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20H=C3=BCttel?= Date: Mon, 18 Nov 2024 21:19:59 +0100 Subject: [PATCH] Fixup imports in package views --- .../parts/views/package_views.py | 33 +++++++------------ 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/shimatta_kenkyusho/parts/views/package_views.py b/shimatta_kenkyusho/parts/views/package_views.py index 0927ca1..324ea9e 100644 --- a/shimatta_kenkyusho/parts/views/package_views.py +++ b/shimatta_kenkyusho/parts/views/package_views.py @@ -1,20 +1,11 @@ -from django.shortcuts import render, redirect -from django.urls import reverse -from django.contrib.auth.forms import AuthenticationForm as AuthForm -from django.contrib.auth.forms import PasswordChangeForm -from django.contrib.auth import update_session_auth_hash -import django.forms as forms +from django.shortcuts import redirect from django.views.generic import TemplateView, DetailView from django.contrib.auth.mixins import LoginRequiredMixin -from ..models import Storage, Stock, Component, Distributor, Manufacturer, Package, ComponentParameter, DistributorNum +from ..models import Package from django.core.paginator import Paginator -from django.core.exceptions import ValidationError -from django.db import IntegrityError from django.db.models import ProtectedError from ..forms import * from django.db.models import Q -from django.db.models.functions import Lower -import uuid from .generic_views import BaseTemplateMixin class PackageView(LoginRequiredMixin, BaseTemplateMixin, TemplateView): @@ -28,7 +19,7 @@ class PackageView(LoginRequiredMixin, BaseTemplateMixin, TemplateView): if not search: return qs - + search_fragments = search.strip().split() for search in search_fragments: if search.lower() == 'smd': @@ -47,10 +38,10 @@ class PackageView(LoginRequiredMixin, BaseTemplateMixin, TemplateView): context = super().get_context_data(**kwargs) page_num = self.request.GET.get('page', default=1) search_string = self.request.GET.get('search', default=None) - + package_queryset = self.search_packages(search_string) - paginator = Paginator(package_queryset, self.default_page_size) + paginator = Paginator(package_queryset, self.default_page_size) context['search_string'] = search_string @@ -58,7 +49,7 @@ class PackageView(LoginRequiredMixin, BaseTemplateMixin, TemplateView): context['new_pkg_form'] = PackageForm() return context - + def handle_add_new_package(self, request): form = PackageForm(data=request.POST, files=request.FILES) @@ -77,7 +68,7 @@ class PackageView(LoginRequiredMixin, BaseTemplateMixin, TemplateView): return self.handle_add_new_package(request) return super().post(request, *args, **kwargs) - + class PackageDetailView(LoginRequiredMixin, BaseTemplateMixin, DetailView): template_name = 'parts/packages-detail.html' @@ -85,19 +76,19 @@ class PackageDetailView(LoginRequiredMixin, BaseTemplateMixin, DetailView): pk_url_kwarg = 'uuid' base_title = '' navbar_selected = 'Packages' - + def get_context_data(self, **kwargs): self.base_title = 'Package / '+self.object.name context = super().get_context_data(**kwargs) context['package'] = self.object context['edit_form'] = PackageForm(instance=self.object) - + return context def handle_delete_package(self, request): delete_error = None protected_objects = None - + # Try to delete this instance try: self.object.delete() @@ -106,7 +97,7 @@ class PackageDetailView(LoginRequiredMixin, BaseTemplateMixin, DetailView): protected_objects = pe.protected_objects except: delete_error = 'Cannot delete this package. Unknown error' - + if delete_error: context = self.get_context_data() context['delete_error'] = delete_error @@ -133,5 +124,5 @@ class PackageDetailView(LoginRequiredMixin, BaseTemplateMixin, DetailView): return self.handle_delete_package(request) elif 'submit-pkg-edit' in request.POST: return self.edit_package(request) - + return super().post(request, *args, **kwargs) \ No newline at end of file