NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-08 08:38:16 -06:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

More cleanup

Browse Source
This commit is contained in:
Jeremy Stretch 2024-08-10 11:23:17 -04:00
parent b7d16b33a7
commit aa5ffc10f6
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/core/views.py
View File

@ -78,7 +78,7 @@ class DataSourceSyncView(BaseObjectView):
messages.success( messages.success(
request, request,
_("Queued job #{job_id} to sync {datasource}").format(job_id=job.pk, datasource=datasource) _("Queued job #{id} to sync {datasource}").format(id=job.pk, datasource=datasource)
) )
return redirect(datasource.get_absolute_url()) return redirect(datasource.get_absolute_url())
@ -438,7 +438,7 @@ class BackgroundTaskEnqueueView(BaseRQView):
registry = ScheduledJobRegistry(queue.name, queue.connection) registry = ScheduledJobRegistry(queue.name, queue.connection)
registry.remove(job) registry.remove(job)
messages.success(request, _('Job {job_id} has been enqueued.').format(job_id=job_id)) messages.success(request, _('Job {id} has been enqueued.').format(id=job_id))
return redirect(reverse('core:background_task', args=[job_id])) return redirect(reverse('core:background_task', args=[job_id]))

5
netbox/dcim/views.py
View File

@ -3498,7 +3498,10 @@ class VirtualChassisRemoveMemberView(ObjectPermissionRequiredMixin, GetReturnURL
device.vc_priority = None device.vc_priority = None
device.save() device.save()
msg = _('Removed {} from virtual chassis {}').format(device, device.virtual_chassis) msg = _('Removed {device} from virtual chassis {chassis}').format(
device=device,
chassis=device.virtual_chassis
)
messages.success(request, msg) messages.success(request, msg)
return redirect(self.get_return_url(request, device)) return redirect(self.get_return_url(request, device))

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

@ -754,12 +754,11 @@ class BulkRenameView(GetReturnURLMixin, BaseMultiObjectView):
if self.queryset.filter(pk__in=renamed_pks).count() != len(selected_objects): if self.queryset.filter(pk__in=renamed_pks).count() != len(selected_objects):
raise PermissionsViolation raise PermissionsViolation
model_name = self.queryset.model._meta.verbose_name_plural
messages.success( messages.success(
request, request,
_("Renamed {count} {object_type}").format( _("Renamed {count} {object_type}").format(
count=len(selected_objects), count=len(selected_objects),
object_type=model_name object_type=self.queryset.model._meta.verbose_name_plural
) )
) )
return redirect(self.get_return_url(request)) return redirect(self.get_return_url(request))
@ -875,7 +874,7 @@ class BulkDeleteView(GetReturnURLMixin, BaseMultiObjectView):
if not table.rows: if not table.rows:
messages.warning( messages.warning(
request, request,
_("No {object_type} were selected for deletion.").format(object_type=model._meta.verbose_name_plural) _("No {object_type} were selected.").format(object_type=model._meta.verbose_name_plural)
) )
return redirect(self.get_return_url(request)) return redirect(self.get_return_url(request))

12
netbox/netbox/views/generic/feature_views.py
View File

@ -206,9 +206,9 @@ class ObjectSyncDataView(View):
return redirect(obj.get_absolute_url()) return redirect(obj.get_absolute_url())
obj.sync(save=True) obj.sync(save=True)
messages.success(request, _("Synchronized data for {name} {obj}.").format( messages.success(request, _("Synchronized data for {object_type} {object}.").format(
name=model._meta.verbose_name, object_type=model._meta.verbose_name,
obj=obj object=obj
)) ))
return redirect(obj.get_absolute_url()) return redirect(obj.get_absolute_url())
@ -231,7 +231,9 @@ class BulkSyncDataView(GetReturnURLMixin, BaseMultiObjectView):
for obj in selected_objects: for obj in selected_objects:
obj.sync(save=True) obj.sync(save=True)
model_name = self.queryset.model._meta.verbose_name_plural messages.success(request, _("Synced {count} {object_type}").format(
messages.success(request, _("Synced {len} {model_name}").format(len=len(selected_objects), model_name=model_name)) count=len(selected_objects),
object_type=self.queryset.model._meta.verbose_name_plural
))
return redirect(self.get_return_url(request)) return redirect(self.get_return_url(request))