NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-09-06 14:23:36 -06:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

#19713: Remove changelog_message from bulk import form for unsupported models

Browse Source
This commit is contained in:
Jeremy Stretch 2025-08-13 14:40:52 -04:00
parent f083cf79fe
commit 4bd5b3574f
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
netbox/netbox/views/generic/bulk_views.py
View File

@ -21,6 +21,7 @@ from core.models import ObjectType
from core.signals import clear_events from core.signals import clear_events
from extras.choices import CustomFieldUIEditableChoices from extras.choices import CustomFieldUIEditableChoices
from extras.models import CustomField, ExportTemplate from extras.models import CustomField, ExportTemplate
from netbox.models.features import ChangeLoggingMixin
from netbox.object_actions import AddObject, BulkDelete, BulkEdit, BulkExport, BulkImport, BulkRename from netbox.object_actions import AddObject, BulkDelete, BulkEdit, BulkExport, BulkImport, BulkRename
from utilities.error_handlers import handle_protectederror from utilities.error_handlers import handle_protectederror
from utilities.exceptions import AbortRequest, PermissionsViolation from utilities.exceptions import AbortRequest, PermissionsViolation
@ -495,10 +496,13 @@ class BulkImportView(GetReturnURLMixin, BaseMultiObjectView):
# #
def get(self, request): def get(self, request):
model = self.model_form._meta.model
form = BulkImportForm() form = BulkImportForm()
if not issubclass(model, ChangeLoggingMixin):
form.fields.pop('changelog_message')
return render(request, self.template_name, { return render(request, self.template_name, {
'model': self.model_form._meta.model, 'model': model,
'form': form, 'form': form,
'fields': self._get_form_fields(), 'fields': self._get_form_fields(),
'return_url': self.get_return_url(request), 'return_url': self.get_return_url(request),
@ -509,6 +513,8 @@ class BulkImportView(GetReturnURLMixin, BaseMultiObjectView):
logger = logging.getLogger('netbox.views.BulkImportView') logger = logging.getLogger('netbox.views.BulkImportView')
model = self.model_form._meta.model model = self.model_form._meta.model
form = BulkImportForm(request.POST, request.FILES) form = BulkImportForm(request.POST, request.FILES)
if not issubclass(model, ChangeLoggingMixin):
form.fields.pop('changelog_message')
if form.is_valid(): if form.is_valid():
logger.debug("Import form validation was successful") logger.debug("Import form validation was successful")

21
netbox/templates/generic/bulk_import.html
View File

@ -53,8 +53,10 @@ Context:
{% render_field form.csv_delimiter %} {% render_field form.csv_delimiter %}
{# Meta fields #} {# Meta fields #}
<div class="bg-primary-subtle border border-primary rounded-1 pt-3 mb-3"> <div class="bg-primary-subtle border border-primary rounded-1 pt-3 px-3 mb-3">
{% render_field form.changelog_message %} {% if form.changelog_message %}
{% render_field form.changelog_message %}
{% endif %}
{% render_field form.background_job %} {% render_field form.background_job %}
</div> </div>
@ -83,9 +85,12 @@ Context:
{% render_field form.csv_delimiter %} {% render_field form.csv_delimiter %}
{# Meta fields #} {# Meta fields #}
<div class="bg-primary-subtle border border-primary rounded-1 pt-3 mb-3"> {# Background jobs not supported with file uploads #}
{% render_field form.changelog_message %} {% if form.changelog_message %}
</div> <div class="bg-primary-subtle border border-primary rounded-1 pt-3 px-3 mb-3">
{% render_field form.changelog_message %}
</div>
{% endif %}
<div class="form-group"> <div class="form-group">
<div class="col col-md-12 text-end"> <div class="col col-md-12 text-end">
@ -113,8 +118,10 @@ Context:
{% render_field form.csv_delimiter %} {% render_field form.csv_delimiter %}
{# Meta fields #} {# Meta fields #}
<div class="bg-primary-subtle border border-primary rounded-1 pt-3 mb-3"> <div class="bg-primary-subtle border border-primary rounded-1 pt-3 px-3 mb-3">
{% render_field form.changelog_message %} {% if form.changelog_message %}
{% render_field form.changelog_message %}
{% endif %}
{% render_field form.background_job %} {% render_field form.background_job %}
</div> </div>