mirror of https://github.com/jumpserver/jumpserver
perf: 优化 labels 绑定资源 (#12361)
* perf: 优化 labels 绑定资源 * perf: 优化 labels list 显示 * perf: add migrations --------- Co-authored-by: ibuler <ibuler@qq.com>pull/12363/head
parent
1358cf532f
commit
1afad40dd3
|
@ -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)
|
||||
|
||||
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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',
|
||||
|
|
Loading…
Reference in New Issue