update the forms to use the new utils

This commit is contained in:
Andreas Zweili 2020-02-29 15:18:29 +01:00
parent 26dcbf4cb5
commit d4b48728c2
1 changed files with 6 additions and 13 deletions

View File

@ -1,10 +1,8 @@
import floppyforms.__future__ as forms
from guardian.shortcuts import get_objects_for_user
from core import utils
from .models import Computer
from customers.models import Customer
from users.models import User
from computers.models import Computer
class ComputerCreateForm(forms.ModelForm):
@ -15,10 +13,10 @@ class ComputerCreateForm(forms.ModelForm):
'customer',
)
def __init__(self, pk=None, user=None, *args, **kwargs):
def __init__(self, user=None, *args, **kwargs):
super(ComputerCreateForm, self).__init__(*args, **kwargs)
if not user.is_superuser:
self.fields['customer'].queryset = (Customer.objects.filter(id=pk))
self.fields['customer'].queryset = utils.get_customers(user)
class ComputerUpdateForm(forms.ModelForm):
@ -41,10 +39,5 @@ class ComputerUpdateForm(forms.ModelForm):
def __init__(self, user=None, *args, **kwargs):
super(ComputerUpdateForm, self).__init__(*args, **kwargs)
if not user.is_superuser:
customers = get_objects_for_user(user,
'customers.view_customer',
klass=Customer)
self.fields['customer'].queryset = customers
self.fields['user'].queryset = User.objects.filter(
customer__in=customers)
self.fields['customer'].queryset = utils.get_customers(user)
self.fields['user'].queryset = utils.get_objects("User", user)