From 1afad40dd338978f778e1d9432cd514ef464fb07 Mon Sep 17 00:00:00 2001
From: fit2bot <68588906+fit2bot@users.noreply.github.com>
Date: Tue, 19 Dec 2023 10:20:11 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=20labels=20=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A=E8=B5=84=E6=BA=90=20(#12361)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* perf: 优化 labels 绑定资源

* perf: 优化 labels list 显示

* perf: add migrations

---------

Co-authored-by: ibuler <ibuler@qq.com>
---
 apps/labels/api.py                                              | 1 -
 apps/labels/const.py                                            | 2 +-
 .../migrations/0003_alter_labeledresource_options_and_more.py   | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/apps/labels/api.py b/apps/labels/api.py
index 24c1d0463..2dc51e4b8 100644
--- a/apps/labels/api.py
+++ b/apps/labels/api.py
@@ -45,7 +45,6 @@ class ContentTypeViewSet(JMSModelViewSet):
         keyword = request.query_params.get('search')
         if keyword:
             queryset = content_type.filter_queryset(queryset, keyword)
-        queryset = queryset.order_by('res_type')
         return self.get_paginated_response_from_queryset(queryset)
 
 
diff --git a/apps/labels/const.py b/apps/labels/const.py
index cf7038235..bf77ed46b 100644
--- a/apps/labels/const.py
+++ b/apps/labels/const.py
@@ -1,10 +1,10 @@
-from django.contrib.contenttypes.models import ContentType
 from django.utils.functional import LazyObject
 
 
 class LabeledResourceType(LazyObject):
     @staticmethod
     def get_res_types():
+        from rbac.models import ContentType
         content_types = ContentType.objects.all()
         ids = []
         for ct in content_types:
diff --git a/apps/labels/migrations/0003_alter_labeledresource_options_and_more.py b/apps/labels/migrations/0003_alter_labeledresource_options_and_more.py
index 852376180..c879b7888 100644
--- a/apps/labels/migrations/0003_alter_labeledresource_options_and_more.py
+++ b/apps/labels/migrations/0003_alter_labeledresource_options_and_more.py
@@ -19,7 +19,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='labeledresource',
             name='label',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='labeled_resources', to='labels.label'),
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='labeled_resources', to='labels.label', verbose_name='Label'),
         ),
         migrations.AlterUniqueTogether(
             name='labeledresource',