github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

perf: ticket help text

pull/9214/head
feng 2022-12-15 11:59:14 +08:00
parent acfce4961c
commit cbf91e4c29
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/jumpserver/api.py
View File

@ -232,7 +232,7 @@ class DatesLoginMetricMixin:
result = list(result)
for i in result:
tp = i['type']
i['label'] = all_types_dict[tp]
i['label'] = all_types_dict.get(tp, tp)
return result
def get_dates_login_times_assets(self):

12
apps/tickets/serializers/ticket/apply_asset.py
View File

@ -13,10 +13,18 @@ __all__ = ['ApplyAssetSerializer', 'ApproveAssetSerializer']
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):
apply_assets = ObjectRelatedField(queryset=Asset.objects, many=True, required=False, label=_('Apply assets'))
apply_nodes = ObjectRelatedField(queryset=Node.objects, many=True, required=False, label=_('Apply nodes'))
apply_assets = ObjectRelatedField(
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"))
permission_model = AssetPermission