Nebucatnetzer
/
network_inventory
mirror of https://github.com/Nebucatnetzer/network_inventory.git
1
0
Fork 0
Code Issues Releases Wiki Activity

remove the various formsets from the computer forms 

The formsets are currently just too much of a hasle. I can do 90% of the
functionality I want without them and don't have problems with adding a new
relationship everytime I'm updating the computer object.
This commit is contained in:
Andreas Zweili 2020-05-26 23:25:21 +02:00
parent 7336aac441
commit 19eae6768a
3 changed files with 9 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
computers/forms.py
View File

@ -3,9 +3,6 @@ import floppyforms.__future__ as forms
from core import utils
from computers.models import Computer
from computers.models import ComputerCpuRelation
from computers.models import ComputerRamRelation
from devices.models import Warranty
class ComputerCreateForm(forms.ModelForm):
@ -27,57 +24,10 @@ class ComputerCreateForm(forms.ModelForm):
class ComputerUpdateForm(forms.ModelForm):
"""
Basic form class to use crispies HTML5 forms.
"""
class Meta:
model = Computer
fields = (
'name',
'description',
'serialnumber',
'category',
'owner',
'customer',
'manufacturer',
'model',
'location',
'user',
'installation_date',
)
ComputerFormSet = forms.inlineformset_factory(Computer,
Warranty,
fields=(
'valid_from',
'valid_until',
'warranty_type',
),
exclude=[],
can_delete=False,
form=ComputerUpdateForm,
max_num=1)
CpuFormSet = forms.inlineformset_factory(Computer,
ComputerCpuRelation,
fields=(
'cpu',
'computer',
'amount',
),
exclude=[],
can_delete=False,
form=ComputerUpdateForm,
max_num=1)
RamFormSet = forms.inlineformset_factory(Computer,
ComputerRamRelation,
fields=(
'ram',
'computer',
'amount',
),
exclude=[],
can_delete=False,
form=ComputerUpdateForm,
max_num=1)
fields = '__all__'
exclude = ('net', 'cpu', 'ram', 'gpu', 'disks', 'software')

17
computers/templates/computers/computer_update.html
View File

@ -13,23 +13,6 @@
</div>
</div>
</div>
<div class="col">
<div class="card mt-3">
<div class="card-body">
{{ computer_formset|crispy }}
</div>
</div>
<div class="card mt-3">
<div class="card-body">
{{ cpu_formset|crispy }}
</div>
</div>
<div class="card mt-3">
<div class="card-body">
{{ ram_formset|crispy }}
</div>
</div>
</div>
</div>
<br>
<input type="submit" value="Save" class="btn btn-primary">

68
computers/views.py
View File

@ -21,9 +21,7 @@ from licenses.models import LicenseWithComputer
from .decorators import computer_view_permission
from .filters import ComputerFilter
from .forms import ComputerCreateForm
from .forms import ComputerFormSet
from .forms import CpuFormSet
from .forms import RamFormSet
from .forms import ComputerUpdateForm
from .models import Computer
from .models import ComputerCpuRelation
from .models import ComputerDiskRelation
@ -122,66 +120,8 @@ class ComputerCreateFromCustomerView(LoginRequiredMixin, CreateView):
class ComputerUpdateView(LoginRequiredMixin, UpdateView):
model = Computer
fields = (
'name',
'description',
'serialnumber',
'category',
'owner',
'customer',
'manufacturer',
'model',
'location',
'user',
'installation_date',
'os',
)
form_class = ComputerUpdateForm
template_name = 'computers/computer_update.html'
# def get_form_kwargs(self):
# """
# Pass the request user to the form.
# """
# kwargs = super(ComputerUpdateView, self).get_form_kwargs()
# kwargs.update({'user': self.request.user})
# return kwargs
def get_context_data(self, **kwargs):
context = super(ComputerUpdateView, self).get_context_data(**kwargs)
if self.request.POST:
context['computer_formset'] = ComputerFormSet(
self.request.POST,
instance=self.object)
context['computer_formset'].full_clean()
context['cpu_formset'] = CpuFormSet(
self.request.POST,
instance=self.object)
context['cpu_formset'].full_clean()
context['ram_formset'] = RamFormSet(
self.request.POST,
instance=self.object)
context['ram_formset'].full_clean()
else:
context['computer_formset'] = ComputerFormSet(instance=self.object)
context['cpu_formset'] = CpuFormSet(instance=self.object)
context['ram_formset'] = RamFormSet(instance=self.object)
return context
def form_valid(self, form):
context = self.get_context_data(form=form)
computer_formset = context['computer_formset']
cpu_formset = context['cpu_formset']
ram_formset = context['ram_formset']
if (computer_formset.is_valid()
and cpu_formset.is_valid()
and ram_formset.is_valid()):
response = super().form_valid(form)
computer_formset.instance = self.object
computer_formset.save()
cpu_formset.instance = self.object
cpu_formset.save()
ram_formset.instance = self.object
ram_formset.save()
return response
else:
return super().form_invalid(form)
def get_success_url(self):
return reverse('computer', args=(self.object.pk,))