mhu/4-port-to-django-5.1 Port to recent Django version #18
@@ -1,20 +1,11 @@
 | 
				
			|||||||
from django.shortcuts import render, redirect
 | 
					from django.shortcuts import 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.views.generic import TemplateView, DetailView
 | 
					from django.views.generic import TemplateView, DetailView
 | 
				
			||||||
from django.contrib.auth.mixins import LoginRequiredMixin
 | 
					from django.contrib.auth.mixins import LoginRequiredMixin
 | 
				
			||||||
from ..models import Storage, Stock, Component, Distributor, Manufacturer, Package, ComponentParameter, DistributorNum
 | 
					from ..models import Manufacturer
 | 
				
			||||||
from django.core.paginator import Paginator
 | 
					from django.core.paginator import Paginator
 | 
				
			||||||
from django.core.exceptions import ValidationError
 | 
					 | 
				
			||||||
from django.db import IntegrityError
 | 
					 | 
				
			||||||
from django.db.models import ProtectedError
 | 
					from django.db.models import ProtectedError
 | 
				
			||||||
from ..forms import *
 | 
					from ..forms import *
 | 
				
			||||||
from django.db.models import Q
 | 
					from django.db.models import Q
 | 
				
			||||||
from django.db.models.functions import Lower
 | 
					 | 
				
			||||||
import uuid
 | 
					 | 
				
			||||||
from .generic_views import BaseTemplateMixin
 | 
					from .generic_views import BaseTemplateMixin
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class ManufacturersView(LoginRequiredMixin, BaseTemplateMixin, TemplateView):
 | 
					class ManufacturersView(LoginRequiredMixin, BaseTemplateMixin, TemplateView):
 | 
				
			||||||
@@ -28,7 +19,7 @@ class ManufacturersView(LoginRequiredMixin, BaseTemplateMixin, TemplateView):
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        if not search:
 | 
					        if not search:
 | 
				
			||||||
            return qs
 | 
					            return qs
 | 
				
			||||||
        
 | 
					
 | 
				
			||||||
        search_fragements = search.strip().split()
 | 
					        search_fragements = search.strip().split()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        for search in search_fragements:
 | 
					        for search in search_fragements:
 | 
				
			||||||
@@ -40,10 +31,10 @@ class ManufacturersView(LoginRequiredMixin, BaseTemplateMixin, TemplateView):
 | 
				
			|||||||
        context = super().get_context_data(**kwargs)
 | 
					        context = super().get_context_data(**kwargs)
 | 
				
			||||||
        page_num = self.request.GET.get('page', default=1)
 | 
					        page_num = self.request.GET.get('page', default=1)
 | 
				
			||||||
        search_string = self.request.GET.get('search', default=None)
 | 
					        search_string = self.request.GET.get('search', default=None)
 | 
				
			||||||
        
 | 
					
 | 
				
			||||||
        queryset = self.search_manufacturers(search_string)
 | 
					        queryset = self.search_manufacturers(search_string)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        paginator = Paginator(queryset, self.default_page_size)       
 | 
					        paginator = Paginator(queryset, self.default_page_size)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        context['search_string'] = search_string
 | 
					        context['search_string'] = search_string
 | 
				
			||||||
@@ -51,7 +42,7 @@ class ManufacturersView(LoginRequiredMixin, BaseTemplateMixin, TemplateView):
 | 
				
			|||||||
        context['new_manufacturer_form'] = ManufacturerForm()
 | 
					        context['new_manufacturer_form'] = ManufacturerForm()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        return context
 | 
					        return context
 | 
				
			||||||
    
 | 
					
 | 
				
			||||||
    def handle_add_new_manufacturer(self, request):
 | 
					    def handle_add_new_manufacturer(self, request):
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        form = ManufacturerForm(data=request.POST, files=request.FILES)
 | 
					        form = ManufacturerForm(data=request.POST, files=request.FILES)
 | 
				
			||||||
@@ -78,19 +69,19 @@ class ManufacturerDetailView(LoginRequiredMixin, BaseTemplateMixin, DetailView):
 | 
				
			|||||||
    pk_url_kwarg = 'uuid'
 | 
					    pk_url_kwarg = 'uuid'
 | 
				
			||||||
    base_title = ''
 | 
					    base_title = ''
 | 
				
			||||||
    navbar_selected = 'Manufacturers'
 | 
					    navbar_selected = 'Manufacturers'
 | 
				
			||||||
    
 | 
					
 | 
				
			||||||
    def get_context_data(self, **kwargs):
 | 
					    def get_context_data(self, **kwargs):
 | 
				
			||||||
        self.base_title = 'Manufacturer / '+self.object.name
 | 
					        self.base_title = 'Manufacturer / '+self.object.name
 | 
				
			||||||
        context = super().get_context_data(**kwargs)
 | 
					        context = super().get_context_data(**kwargs)
 | 
				
			||||||
        context['manufacturer'] = self.object
 | 
					        context['manufacturer'] = self.object
 | 
				
			||||||
        context['edit_form'] = ManufacturerForm(instance=self.object)
 | 
					        context['edit_form'] = ManufacturerForm(instance=self.object)
 | 
				
			||||||
 
 | 
					
 | 
				
			||||||
        return context
 | 
					        return context
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def handle_delete_manufacturer(self, request):
 | 
					    def handle_delete_manufacturer(self, request):
 | 
				
			||||||
        delete_error = None
 | 
					        delete_error = None
 | 
				
			||||||
        protected_objects = None
 | 
					        protected_objects = None
 | 
				
			||||||
        
 | 
					
 | 
				
			||||||
        # Try to delete this instance
 | 
					        # Try to delete this instance
 | 
				
			||||||
        try:
 | 
					        try:
 | 
				
			||||||
            self.object.delete()
 | 
					            self.object.delete()
 | 
				
			||||||
@@ -99,7 +90,7 @@ class ManufacturerDetailView(LoginRequiredMixin, BaseTemplateMixin, DetailView):
 | 
				
			|||||||
            protected_objects = pe.protected_objects
 | 
					            protected_objects = pe.protected_objects
 | 
				
			||||||
        except:
 | 
					        except:
 | 
				
			||||||
            delete_error = 'Cannot delete this distributor. Unknown error'
 | 
					            delete_error = 'Cannot delete this distributor. Unknown error'
 | 
				
			||||||
        
 | 
					
 | 
				
			||||||
        if delete_error:
 | 
					        if delete_error:
 | 
				
			||||||
            context = self.get_context_data()
 | 
					            context = self.get_context_data()
 | 
				
			||||||
            context['delete_error'] = delete_error
 | 
					            context['delete_error'] = delete_error
 | 
				
			||||||
@@ -126,5 +117,5 @@ class ManufacturerDetailView(LoginRequiredMixin, BaseTemplateMixin, DetailView):
 | 
				
			|||||||
            return self.handle_delete_manufacturer(request)
 | 
					            return self.handle_delete_manufacturer(request)
 | 
				
			||||||
        elif 'submit-manufacturer-edit' in request.POST:
 | 
					        elif 'submit-manufacturer-edit' in request.POST:
 | 
				
			||||||
            return self.edit_manufacturer(request)
 | 
					            return self.edit_manufacturer(request)
 | 
				
			||||||
        
 | 
					
 | 
				
			||||||
        return super().post(request, *args, **kwargs)
 | 
					        return super().post(request, *args, **kwargs)
 | 
				
			||||||
		Reference in New Issue
	
	Block a user