From 7fe0ee5104fc89107fba0102400bae1ebbedc24e Mon Sep 17 00:00:00 2001 From: Arthur Date: Fri, 2 Feb 2024 07:25:41 -0800 Subject: [PATCH] 12510 move migration --- .../migrations/0011_job_report_to_script.py | 28 ------------------- .../0106_delete_report_delete_reportmodule.py | 16 ++++++++++- 2 files changed, 15 insertions(+), 29 deletions(-) delete mode 100644 netbox/core/migrations/0011_job_report_to_script.py diff --git a/netbox/core/migrations/0011_job_report_to_script.py b/netbox/core/migrations/0011_job_report_to_script.py deleted file mode 100644 index 25bc181c4..000000000 --- a/netbox/core/migrations/0011_job_report_to_script.py +++ /dev/null @@ -1,28 +0,0 @@ -# Generated by Django 5.0.1 on 2024-01-26 18:11 - -from django.db import migrations - - -def migrate_report_jobs(apps, schema_editor): - ContentType = apps.get_model('contenttypes', 'ContentType') - Job = apps.get_model('core', 'Job') - - # Delete the new ContentType effected by the introduction of core.ConfigRevision - if ContentType.objects.filter(app_label='extras', model='reportmodule'): - report_content_type = ContentType.objects.get(app_label='extras', model='reportmodule') - script_content_type = ContentType.objects.get(app_label='extras', model='scriptmodule') - jobs = Job.objects.filter(object_type_id=report_content_type.id).update(object_type_id=script_content_type.id) - - -class Migration(migrations.Migration): - - dependencies = [ - ('core', '0010_gfk_indexes'), - ] - - operations = [ - migrations.RunPython( - code=migrate_report_jobs, - reverse_code=migrations.RunPython.noop - ), - ] diff --git a/netbox/extras/migrations/0106_delete_report_delete_reportmodule.py b/netbox/extras/migrations/0106_delete_report_delete_reportmodule.py index 3eb98d56f..8ebd2c004 100644 --- a/netbox/extras/migrations/0106_delete_report_delete_reportmodule.py +++ b/netbox/extras/migrations/0106_delete_report_delete_reportmodule.py @@ -3,14 +3,28 @@ from django.db import migrations +def migrate_report_jobs(apps, schema_editor): + ContentType = apps.get_model('contenttypes', 'ContentType') + Job = apps.get_model('core', 'Job') + + # Delete the new ContentType effected by the introduction of core.ConfigRevision + if ContentType.objects.filter(app_label='extras', model='reportmodule'): + report_content_type = ContentType.objects.get(app_label='extras', model='reportmodule') + script_content_type = ContentType.objects.get(app_label='extras', model='scriptmodule') + jobs = Job.objects.filter(object_type_id=report_content_type.id).update(object_type_id=script_content_type.id) + + class Migration(migrations.Migration): dependencies = [ ('extras', '0105_customfield_min_max_values'), - ('core', '0011_job_report_to_script'), ] operations = [ + migrations.RunPython( + code=migrate_report_jobs, + reverse_code=migrations.RunPython.noop + ), migrations.DeleteModel( name='Report', ),