mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Fixes #15891: Ensure deterministic ordering for scripts & reports

Browse Source
This commit is contained in:
Jeremy Stretch
2024-05-01 09:31:33 -04:00
parent d256c04d9c
commit a2efec09be
4 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/extras/migrations/0091_create_managedfiles.py
View File

@ -50,6 +50,7 @@ class Migration(migrations.Migration):
], ],
options={ options={
'proxy': True, 'proxy': True,
'ordering': ('file_root', 'file_path'),
'indexes': [], 'indexes': [],
'constraints': [], 'constraints': [],
}, },
@ -61,6 +62,7 @@ class Migration(migrations.Migration):
], ],
options={ options={
'proxy': True, 'proxy': True,
'ordering': ('file_root', 'file_path'),
'indexes': [], 'indexes': [],
'constraints': [], 'constraints': [],
}, },

1
netbox/extras/models/reports.py
View File

@ -43,6 +43,7 @@ class ReportModule(PythonModuleMixin, JobsMixin, ManagedFile):
class Meta: class Meta:
proxy = True proxy = True
ordering = ('file_root', 'file_path')
verbose_name = _('report module') verbose_name = _('report module')
verbose_name_plural = _('report modules') verbose_name_plural = _('report modules')

1
netbox/extras/models/scripts.py
View File

@ -51,6 +51,7 @@ class ScriptModule(PythonModuleMixin, JobsMixin, ManagedFile):
class Meta: class Meta:
proxy = True proxy = True
ordering = ('file_root', 'file_path')
verbose_name = _('script module') verbose_name = _('script module')
verbose_name_plural = _('script modules') verbose_name_plural = _('script modules')

4
netbox/extras/views.py
View File

@ -1042,7 +1042,7 @@ class ReportListView(ContentTypePermissionRequiredMixin, View):
return 'extras.view_report' return 'extras.view_report'
def get(self, request): def get(self, request):
report_modules = ReportModule.objects.restrict(request.user) report_modules = ReportModule.objects.restrict(request.user).prefetch_related('data_source', 'data_file')
return render(request, 'extras/report_list.html', { return render(request, 'extras/report_list.html', {
'model': ReportModule, 'model': ReportModule,
@ -1217,7 +1217,7 @@ class ScriptListView(ContentTypePermissionRequiredMixin, View):
return 'extras.view_script' return 'extras.view_script'
def get(self, request): def get(self, request):
script_modules = ScriptModule.objects.restrict(request.user) script_modules = ScriptModule.objects.restrict(request.user).prefetch_related('data_source', 'data_file')
return render(request, 'extras/script_list.html', { return render(request, 'extras/script_list.html', {
'model': ScriptModule, 'model': ScriptModule,