From 71285935028e41398f2782b6a1ada8fb8214058b Mon Sep 17 00:00:00 2001
From: fit2bot <68588906+fit2bot@users.noreply.github.com>
Date: Fri, 22 Sep 2023 15:06:58 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20CeleryTaskExecution=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=BB=98=E8=AE=A4=E6=8E=92=E5=BA=8F=20(#11663)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: feng <1304903146@qq.com>
---
 .../migrations/0004_auto_20230106_1507.py       |  4 ++--
 .../migrations/0015_auto_20230825_1120.py       |  2 +-
 .../0027_alter_celerytaskexecution_options.py   | 17 +++++++++++++++++
 apps/ops/models/celery.py                       |  5 +++--
 apps/terminal/migrations/0062_applet_edition.py |  2 +-
 5 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 apps/ops/migrations/0027_alter_celerytaskexecution_options.py

diff --git a/apps/accounts/migrations/0004_auto_20230106_1507.py b/apps/accounts/migrations/0004_auto_20230106_1507.py
index 3be64ef5a..6392fce3b 100644
--- a/apps/accounts/migrations/0004_auto_20230106_1507.py
+++ b/apps/accounts/migrations/0004_auto_20230106_1507.py
@@ -13,11 +13,11 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='changesecretautomation',
             name='secret_strategy',
-            field=models.CharField(choices=[('specific', 'Specific password'), ('random', 'Random')], default='specific', max_length=16, verbose_name='Secret strategy'),
+            field=models.CharField(choices=[('specific', 'Specific secret'), ('random', 'Random generate')], default='specific', max_length=16, verbose_name='Secret strategy'),
         ),
         migrations.AlterField(
             model_name='pushaccountautomation',
             name='secret_strategy',
-            field=models.CharField(choices=[('specific', 'Specific password'), ('random', 'Random')], default='specific', max_length=16, verbose_name='Secret strategy'),
+            field=models.CharField(choices=[('specific', 'Specific secret'), ('random', 'Random generate')], default='specific', max_length=16, verbose_name='Secret strategy'),
         ),
     ]
diff --git a/apps/accounts/migrations/0015_auto_20230825_1120.py b/apps/accounts/migrations/0015_auto_20230825_1120.py
index 083c88634..533613855 100644
--- a/apps/accounts/migrations/0015_auto_20230825_1120.py
+++ b/apps/accounts/migrations/0015_auto_20230825_1120.py
@@ -29,6 +29,6 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='accounttemplate',
             name='secret_strategy',
-            field=models.CharField(choices=[('specific', 'Specific password'), ('random', 'Random')], default='specific', max_length=16, verbose_name='Secret strategy'),
+            field=models.CharField(choices=[('specific', 'Specific secret'), ('random', 'Random generate')], default='specific', max_length=16, verbose_name='Secret strategy'),
         ),
     ]
diff --git a/apps/ops/migrations/0027_alter_celerytaskexecution_options.py b/apps/ops/migrations/0027_alter_celerytaskexecution_options.py
new file mode 100644
index 000000000..0b3e07308
--- /dev/null
+++ b/apps/ops/migrations/0027_alter_celerytaskexecution_options.py
@@ -0,0 +1,17 @@
+# Generated by Django 4.1.10 on 2023-09-22 06:52
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ops', '0026_auto_20230810_1039'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='celerytaskexecution',
+            options={'ordering': ['-date_start'], 'verbose_name': 'Celery Task Execution'},
+        ),
+    ]
diff --git a/apps/ops/models/celery.py b/apps/ops/models/celery.py
index e0f566ff1..f17ffe685 100644
--- a/apps/ops/models/celery.py
+++ b/apps/ops/models/celery.py
@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 #
-import uuid
 import os
+import uuid
 
-from django.utils.translation import gettext_lazy as _
 from django.conf import settings
 from django.db import models
+from django.utils.translation import gettext_lazy as _
 
 from ops.celery import app
 
@@ -83,4 +83,5 @@ class CeleryTaskExecution(models.Model):
         return "{}: {}".format(self.name, self.id)
 
     class Meta:
+        ordering = ['-date_start']
         verbose_name = _("Celery Task Execution")
diff --git a/apps/terminal/migrations/0062_applet_edition.py b/apps/terminal/migrations/0062_applet_edition.py
index bd5118edf..8ca93ce2f 100644
--- a/apps/terminal/migrations/0062_applet_edition.py
+++ b/apps/terminal/migrations/0062_applet_edition.py
@@ -12,7 +12,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='applet',
             name='edition',
-            field=models.CharField(choices=[('community', 'Community'), ('enterprise', 'Enterprise')],
+            field=models.CharField(choices=[('community', 'Community edition'), ('enterprise', 'Enterprise')],
                                    default='community', max_length=128, verbose_name='Edition'),
         ),
     ]