Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
guo xiaoyong
Jumpserver
Commits
d042de7b
Unverified
Commit
d042de7b
authored
4 years ago
by
Jiangjie.Bai
Committed by
GitHub
4 years ago
Browse files
Options
Download
Plain Diff
Merge pull request #5972 from jumpserver/dev
v2.9.0 发版
parents
35dfdf83
5e6e97c8
dev
dependabot/pip/requirements/ansible-4.2.0
feat_acl_muiltistrategy
feat_proxyterminal
master
pr@de@perf_role_bingding_migrations
pr@dev@connect_token_to_db
pr@dev@feat_email_task_audit
pr@dev@fix_tcp_syslog
pr@dev@perf_base_model
pr@dev@refactor_tickiets
pr@dev@share_session_link
pr@dev@tdsql_v5.7
pr@dev@tidb
pr@dev@vault_secret
prr@dev@fix_ldapimport
repr@dev_v2.23_v2.22_v2.21@379c7198@fix_esupdatefailed
v2.10
v2.11
v2.12
v2.13
v2.14
v2.15
v2.16
v2.17
v2.18
v2.19
v2.20
v2.21
v2.22
v2.23
v2.9
v2.23.0
v2.22.3
v2.22.2
v2.22.1
v2.22.0
v2.21.4
v2.21.3
v2.21.2
v2.21.1
v2.21.0
v2.20.3
v2.20.2
v2.20.1
v2.20.0
v2.19.2
v2.19.1
v2.19.0
v2.18.3
v2.18.2
v2.18.1
v2.18.0
v2.17.5
v2.17.4
v2.17.3
v2.17.2
v2.17.1
v2.17.0
v2.16.3
v2.16.2
v2.16.1
v2.16.0
v2.15.5
v2.15.4
v2.15.3
v2.15.2
v2.15.1
v2.15.0
v2.14.2
v2.14.1
v2.14.0
v2.13.2
v2.13.1
v2.13.0
v2.12.2
v2.12.1
v2.12.0
v2.11.4
v2.11.3
v2.11.2
v2.11.1
v2.11.0
v2.10.5
v2.10.4
v2.10.3
v2.10.2
v2.10.1
v2.10.0
v2.9.2
v2.9.1
v2.9.0
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
apps/assets/migrations/0069_change_node_key0_to_key1.py
+2
-0
apps/assets/migrations/0069_change_node_key0_to_key1.py
apps/assets/tasks/push_system_user.py
+1
-0
apps/assets/tasks/push_system_user.py
with
3 additions
and
0 deletions
+3
-0
apps/assets/migrations/0069_change_node_key0_to_key1.py
+
2
-
0
View file @
d042de7b
...
...
@@ -42,7 +42,9 @@ def change_key0_to_key1(apps, schema_editor):
key_list
=
n
.
key
.
split
(
':'
)
key_list
[
0
]
=
'1'
new_key
=
':'
.
join
(
key_list
)
new_parent_key
=
':'
.
join
(
key_list
[:
-
1
])
n
.
key
=
new_key
n
.
parent_key
=
new_parent_key
n
.
save
()
print
(
'--> Modify key ( {} > {} )'
.
format
(
old_key
,
new_key
))
...
...
This diff is collapsed.
Click to expand it.
apps/assets/tasks/push_system_user.py
+
1
-
0
View file @
d042de7b
...
...
@@ -57,6 +57,7 @@ def get_push_unixlike_system_user_tasks(system_user, username=None):
'state'
:
'present'
,
'home'
:
system_user
.
home
or
Empty
,
'groups'
:
groups
or
Empty
,
'expires'
:
99999
,
'comment'
:
comment
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help