Fixes #20731 add data file data source to config template bulk import #20778
+47
−5
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…urce-to-config_template-bulk-import
…urce-to-config_template-bulk-import
jeremystretch
requested review from
a team and
jeremystretch
and removed request for
a team
Member
|
@ifoughal could you address the linter errors please? |
…-import' of https://github.com/ifoughal/netbox into 20731-add-data_file-data_source-to-config_template-bulk-import
Author
|
@jeremystretch I have fixed the linter issues. |
jeremystretch
requested changes
Nov 12, 2025
Member
jeremystretch
left a comment
jeremystretch
left a comment
There was a problem hiding this comment.
The functionality is there, but please avoid making changes that deviate from the established style or that modify components out of scope for the PR.
| from django.contrib.postgres.forms import SimpleArrayField | ||
| from django.core.exceptions import ObjectDoesNotExist | ||
| from django.utils.translation import gettext_lazy as _ | ||
|
|
| from utilities.forms import CSVModelForm | ||
| from utilities.forms.fields import ( | ||
| CSVChoiceField, CSVContentTypeField, CSVModelChoiceField, CSVModelMultipleChoiceField, CSVMultipleChoiceField, | ||
| CSVMultipleContentTypeField, SlugField, |
| CSVMultipleContentTypeField, SlugField, | ||
| CSVMultipleContentTypeField, SlugField | ||
| ) | ||
| from core.models import DataSource, DataFile |
Member
There was a problem hiding this comment.
Combine with line 9 above
| model = ExportTemplate | ||
| fields = ( | ||
| 'name', 'object_types', 'description', 'environment_params', 'mime_type', 'file_name', 'file_extension', | ||
| 'name', 'object_types', 'description', 'environment_params', |
Member
There was a problem hiding this comment.
Revert (this class isn't even in scope for the FR)
| CSVChoiceField, CSVContentTypeField, CSVModelChoiceField, CSVModelMultipleChoiceField, CSVMultipleChoiceField, | ||
| CSVMultipleContentTypeField, SlugField, | ||
| CSVMultipleContentTypeField, SlugField | ||
| ) |
| queryset=DataFile.objects.all(), | ||
| required=False, | ||
| to_field_name='path', | ||
| help_text=_('DataFile containing the template code') |
Member
There was a problem hiding this comment.
help_text should be human-friendly
Suggested change
| help_text=_('DataFile containing the template code') | |
| help_text=_('Data file containing the template code') |
| auto_sync_enabled = forms.BooleanField( | ||
| required=False, | ||
| label=_('auto sync enabled'), | ||
| help_text=_("Enable automatic synchronization of data when the data file is updated") |
Member
There was a problem hiding this comment.
Suggested change
| help_text=_("Enable automatic synchronization of data when the data file is updated") | |
| help_text=_("Enable automatic synchronization of template content when the data file is updated") |
| queryset=DataSource.objects.all(), | ||
| required=False, | ||
| to_field_name='name', | ||
| help_text=_('data_source of the config template') |
Member
There was a problem hiding this comment.
Suggested change
| help_text=_('data_source of the config template') | |
| help_text=_('Data source which provides the data file') |
Comment on lines
+200
to
+205
| def clean_template_code(self): | ||
| # Make sure template_code is None when it's not included in the uploaded data | ||
| if not self.data.get('template_code') and not self.data.get('data_file'): | ||
| raise forms.ValidationError(_("Must specify either local content or a data file")) | ||
|
|
||
| return self.cleaned_data['template_code'] |
Member
There was a problem hiding this comment.
This logic should be run under the form's clean() method as it involves more than one field.
Comment on lines
+207
to
+211
| def clean_auto_sync_enabled(self): | ||
| # Make sure is_primary is None when it's not included in the uploaded data | ||
| if not self.data.get('auto_sync_enabled'): | ||
| self.cleaned_data['auto_sync_enabled'] = False | ||
| return self.cleaned_data['auto_sync_enabled'] |
Member
There was a problem hiding this comment.
This does not appear to be needed, as auto_sync_enabled is a boolean field.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes: #20731
During bulk import of config templates, it is not possible to set a data-source with data-file for the config-templates to be imported.
The change adds 3 additional fields to template_code as optional fields: