Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed category parameter template edit form

Browse Source
This commit is contained in:
eeintech 2020-11-02 15:05:37 -05:00
parent 43fab8a8b3
commit 6320384ecb
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
InvenTree/part/forms.py
View File

@ -188,7 +188,8 @@ class EditPartForm(HelperForm):
category_templates = forms.BooleanField(required=False, category_templates = forms.BooleanField(required=False,
initial=False, initial=False,
help_text=_('Create parameters from category templates'), help_text=_('Create parameters based on default category templates'),
label=_('Copy category parameter templates'),
widget=forms.HiddenInput()) widget=forms.HiddenInput())
class Meta: class Meta:

13
InvenTree/part/views.py
View File

@ -2168,7 +2168,7 @@ class CategoryParameterTemplateCreate(AjaxCreateView):
def get_initial(self): def get_initial(self):
""" Get initial data for Category """ """ Get initial data for Category """
initials = super().get_initial().copy() initials = super().get_initial()
category_id = self.kwargs.get('pk', None) category_id = self.kwargs.get('pk', None)
@ -2194,7 +2194,7 @@ class CategoryParameterTemplateCreate(AjaxCreateView):
form.cleaned_data['category'] = self.kwargs.get('pk', None) form.cleaned_data['category'] = self.kwargs.get('pk', None)
try: try:
# Get category # Get selected category
category = self.get_initial()['category'] category = self.get_initial()['category']
# Get existing parameter templates # Get existing parameter templates
@ -2284,12 +2284,15 @@ class CategoryParameterTemplateEdit(AjaxUpdateView):
form.cleaned_data['category'] = self.kwargs.get('pk', None) form.cleaned_data['category'] = self.kwargs.get('pk', None)
try: try:
# Get category # Get selected category
category = PartCategory.objects.get(pk=self.kwargs.get('pk', None)) category = PartCategory.objects.get(pk=self.kwargs.get('pk', None))
# Get selected template
selected_template = self.get_object().parameter_template
# Get existing parameter templates # Get existing parameter templates
parameters = [template.parameter_template.pk parameters = [template.parameter_template.pk
for template in category.get_parameter_templates()] for template in category.get_parameter_templates()
if template.parameter_template.pk != selected_template.pk]
# Exclude templates already linked to category # Exclude templates already linked to category
updated_choices = [] updated_choices = []
@ -2299,6 +2302,8 @@ class CategoryParameterTemplateEdit(AjaxUpdateView):
# Update choices for parameter templates # Update choices for parameter templates
form.fields['parameter_template'].choices = updated_choices form.fields['parameter_template'].choices = updated_choices
# Set initial choice to current template
form.fields['parameter_template'].initial = selected_template
except KeyError: except KeyError:
pass pass