From 1caca32a260647c3c2045e00687a5530666d9881 Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Tue, 21 Feb 2023 15:15:26 +0800 Subject: [PATCH] perf: merge asset migrate (#9662) Co-authored-by: feng <1304903146@qq.com> --- .../migrations/0110_alter_asset_options.py | 2 +- .../migrations/0111_alter_asset_options.py | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 apps/assets/migrations/0111_alter_asset_options.py diff --git a/apps/assets/migrations/0110_alter_asset_options.py b/apps/assets/migrations/0110_alter_asset_options.py index 6d0e2a7aa..fa5495e33 100644 --- a/apps/assets/migrations/0110_alter_asset_options.py +++ b/apps/assets/migrations/0110_alter_asset_options.py @@ -12,6 +12,6 @@ class Migration(migrations.Migration): operations = [ migrations.AlterModelOptions( name='asset', - options={'ordering': ['name'], 'permissions': [('refresh_assethardwareinfo', 'Can refresh asset hardware info'), ('test_assetconnectivity', 'Can test asset connectivity'), ('push_assetaccount', 'Can push account to asset'), ('test_account', 'Can verify account'), ('match_asset', 'Can match asset'), ('change_assetnodes', 'Can change asset nodes')], 'verbose_name': 'Asset'}, + options={'ordering': ['name'], 'permissions': [('refresh_assethardwareinfo', 'Can refresh asset hardware info'), ('test_assetconnectivity', 'Can test asset connectivity'), ('match_asset', 'Can match asset'), ('change_assetnodes', 'Can change asset nodes')], 'verbose_name': 'Asset'}, ), ] diff --git a/apps/assets/migrations/0111_alter_asset_options.py b/apps/assets/migrations/0111_alter_asset_options.py deleted file mode 100644 index 5a54d6830..000000000 --- a/apps/assets/migrations/0111_alter_asset_options.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 3.2.14 on 2023-02-21 05:22 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('assets', '0110_alter_asset_options'), - ] - - operations = [ - migrations.AlterModelOptions( - name='asset', - options={'ordering': ['name'], 'permissions': [('refresh_assethardwareinfo', 'Can refresh asset hardware info'), ('test_assetconnectivity', 'Can test asset connectivity'), ('match_asset', 'Can match asset'), ('change_assetnodes', 'Can change asset nodes')], 'verbose_name': 'Asset'}, - ), - ]