github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-21 19:38:07 +00:00
Code Issues Projects Releases Wiki Activity

feat: user login acl (#6963)

Browse Source 
* feat: user login acl

* 添加分时登陆

* acl 部分还原

* 简化acl判断逻辑

Co-authored-by: feng626 <1304903146@qq.com>
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>
This commit is contained in:
fit2bot
2021-10-20 17:56:59 +08:00
committed by GitHub
parent 9424929dde
commit 9acfd461b4
32 changed files with 325 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/tickets/handler/apply_application.py
View File

@@ -51,10 +51,10 @@ class Handler(BaseHandler):
'''.format(
_('Applied category'), apply_category_display,
_('Applied type'), apply_type_display,
_('Applied application group'), apply_applications,
_('Applied system user group'), apply_system_users,
_('Applied date start'), apply_date_start,
_('Applied date expired'), apply_date_expired,
_('Applied application group'), ','.join(apply_applications),
_('Applied system user group'), ','.join(apply_system_users),
_('Applied date start'), apply_date_start.strftime('%Y-%m-%d %H:%M:%S'),
_('Applied date expired'), apply_date_expired.strftime('%Y-%m-%d %H:%M:%S'),
)
return applied_body