mirror of https://github.com/jumpserver/jumpserver
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
commit
615a1ddc96
|
@ -0,0 +1,29 @@
|
||||||
|
# Generated by Django 3.2.14 on 2022-12-15 07:08
|
||||||
|
|
||||||
|
from django.db import migrations
|
||||||
|
|
||||||
|
|
||||||
|
def migrate_del_macos(apps, schema_editor):
|
||||||
|
db_alias = schema_editor.connection.alias
|
||||||
|
asset_model = apps.get_model('assets', 'Asset')
|
||||||
|
platform_model = apps.get_model('assets', 'Platform')
|
||||||
|
old_macos = platform_model.objects.using(db_alias).get(
|
||||||
|
name='MacOS', type='macos'
|
||||||
|
)
|
||||||
|
new_macos = platform_model.objects.using(db_alias).get(
|
||||||
|
name='macOS', type='unix'
|
||||||
|
)
|
||||||
|
asset_model.objects.using(db_alias).filter(
|
||||||
|
platform=old_macos).update(platform=new_macos)
|
||||||
|
|
||||||
|
platform_model.objects.using(db_alias).filter(id=old_macos.id).delete()
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
dependencies = [
|
||||||
|
('assets', '0113_auto_20221122_2015'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.RunPython(migrate_del_macos),
|
||||||
|
]
|
|
@ -232,7 +232,7 @@ class DatesLoginMetricMixin:
|
||||||
result = list(result)
|
result = list(result)
|
||||||
for i in result:
|
for i in result:
|
||||||
tp = i['type']
|
tp = i['type']
|
||||||
i['label'] = all_types_dict[tp]
|
i['label'] = all_types_dict.get(tp, tp)
|
||||||
return result
|
return result
|
||||||
|
|
||||||
def get_dates_login_times_assets(self):
|
def get_dates_login_times_assets(self):
|
||||||
|
|
|
@ -13,10 +13,18 @@ __all__ = ['ApplyAssetSerializer', 'ApproveAssetSerializer']
|
||||||
|
|
||||||
asset_or_node_help_text = _("Select at least one asset or node")
|
asset_or_node_help_text = _("Select at least one asset or node")
|
||||||
|
|
||||||
|
apply_help_text = _('Support fuzzy search, and display up to 10 items')
|
||||||
|
|
||||||
|
|
||||||
class ApplyAssetSerializer(BaseApplyAssetSerializer, TicketApplySerializer):
|
class ApplyAssetSerializer(BaseApplyAssetSerializer, TicketApplySerializer):
|
||||||
apply_assets = ObjectRelatedField(queryset=Asset.objects, many=True, required=False, label=_('Apply assets'))
|
apply_assets = ObjectRelatedField(
|
||||||
apply_nodes = ObjectRelatedField(queryset=Node.objects, many=True, required=False, label=_('Apply nodes'))
|
queryset=Asset.objects, many=True, required=False,
|
||||||
|
label=_('Apply assets'), help_text=apply_help_text
|
||||||
|
)
|
||||||
|
apply_nodes = ObjectRelatedField(
|
||||||
|
queryset=Node.objects, many=True, required=False,
|
||||||
|
label=_('Apply nodes'), help_text=apply_help_text
|
||||||
|
)
|
||||||
apply_actions = ActionChoicesField(required=False, allow_null=True, label=_("Apply actions"))
|
apply_actions = ActionChoicesField(required=False, allow_null=True, label=_("Apply actions"))
|
||||||
permission_model = AssetPermission
|
permission_model = AssetPermission
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue