diff --git a/apps/assets/migrations/0042_favoriteasset.py b/apps/assets/migrations/0042_favoriteasset.py index 3baebee74..a09759e26 100644 --- a/apps/assets/migrations/0042_favoriteasset.py +++ b/apps/assets/migrations/0042_favoriteasset.py @@ -26,6 +26,7 @@ class Migration(migrations.Migration): ], options={ 'unique_together': {('user', 'asset')}, + 'verbose_name': 'Favorite asset', }, ), ] diff --git a/apps/assets/migrations/0098_auto_20220430_2126.py b/apps/assets/migrations/0098_auto_20220430_2126.py index d3eab6855..89a168316 100644 --- a/apps/assets/migrations/0098_auto_20220430_2126.py +++ b/apps/assets/migrations/0098_auto_20220430_2126.py @@ -64,7 +64,7 @@ def migrate_cloud_to_asset(apps, *args): cloud = cloud_model( id=app.id, name=app.name, address=attrs.get('cluster', ''), - protocols='', platform=platform, + protocols='k8s/443', platform=platform, org_id=app.org_id, ) diff --git a/apps/assets/migrations/0107_automation.py b/apps/assets/migrations/0107_automation.py index 5711481e7..38bb777e4 100644 --- a/apps/assets/migrations/0107_automation.py +++ b/apps/assets/migrations/0107_automation.py @@ -88,4 +88,23 @@ class Migration(migrations.Migration): }, bases=('assets.assetbaseautomation',), ), - ] + migrations.AlterField( + model_name='automationexecution', + name='automation', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='executions', to='assets.baseautomation', verbose_name='Automation task'), + ), + migrations.AlterUniqueTogether( + name='baseautomation', + unique_together={('org_id', 'name', 'type')}, + ), + 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'), + ('add_assettonode', 'Add asset to node'), + ('move_assettonode', 'Move asset to node')], 'verbose_name': 'Asset'}, + ), +] diff --git a/apps/assets/migrations/0108_alter_automationexecution_automation.py b/apps/assets/migrations/0108_alter_automationexecution_automation.py deleted file mode 100644 index 7fa692b2b..000000000 --- a/apps/assets/migrations/0108_alter_automationexecution_automation.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 3.2.16 on 2023-01-05 06:55 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('assets', '0107_automation'), - ] - - operations = [ - migrations.AlterField( - model_name='automationexecution', - name='automation', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='executions', to='assets.baseautomation', verbose_name='Automation task'), - ), - ] diff --git a/apps/assets/migrations/0109_alter_baseautomation_unique_together.py b/apps/assets/migrations/0109_alter_baseautomation_unique_together.py deleted file mode 100644 index a1d141585..000000000 --- a/apps/assets/migrations/0109_alter_baseautomation_unique_together.py +++ /dev/null @@ -1,27 +0,0 @@ -# Generated by Django 3.2.16 on 2023-01-06 07:07 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('assets', '0108_alter_automationexecution_automation'), - ] - - operations = [ - migrations.AlterUniqueTogether( - name='baseautomation', - unique_together={('org_id', 'name', 'type')}, - ), - 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'), - ('add_assettonode', 'Add asset to node'), - ('move_assettonode', 'Move asset to node')], 'verbose_name': 'Asset'}, - ), - ] diff --git a/apps/assets/migrations/0110_alter_favoriteasset_options.py b/apps/assets/migrations/0110_alter_favoriteasset_options.py deleted file mode 100644 index 0aec8be61..000000000 --- a/apps/assets/migrations/0110_alter_favoriteasset_options.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 3.2.16 on 2023-01-10 06:45 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('assets', '0109_alter_baseautomation_unique_together'), - ] - - operations = [ - migrations.AlterModelOptions( - name='favoriteasset', - options={'verbose_name': 'Favorite Asset'}, - ), - ] diff --git a/apps/assets/models/favorite_asset.py b/apps/assets/models/favorite_asset.py index 86d64bbe1..92d52fe7f 100644 --- a/apps/assets/models/favorite_asset.py +++ b/apps/assets/models/favorite_asset.py @@ -14,7 +14,7 @@ class FavoriteAsset(JMSBaseModel): class Meta: unique_together = ('user', 'asset') - verbose_name = _("Favorite Asset") + verbose_name = _("Favorite asset") @classmethod def get_user_favorite_asset_ids(cls, user): diff --git a/apps/tickets/migrations/0029_auto_20230110_1445.py b/apps/tickets/migrations/0029_auto_20230110_1445.py index a6757b534..f17928740 100644 --- a/apps/tickets/migrations/0029_auto_20230110_1445.py +++ b/apps/tickets/migrations/0029_auto_20230110_1445.py @@ -6,7 +6,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('assets', '0110_alter_favoriteasset_options'), + ('assets', '0107_automation'), ('tickets', '0028_remove_app_tickets'), ] diff --git a/ui/lina/.gitkeep b/ui/lina/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/ui/luna/.gitkeep b/ui/luna/.gitkeep new file mode 100644 index 000000000..e69de29bb