Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
J
jumpserver
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ops
jumpserver
Commits
0a35f757
Commit
0a35f757
authored
9 years ago
by
ibuler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modify(function arg) only for writing style
修改函数使用kwarg
parent
f60a8969
master
auditor_jym
audits
dev
dev_beta
dev_beta_db
gengmei
lagacy-0.4.0
node_service
password
rbac
restrict_access
test
v52
wph
1.5.2
1.5.1
1.5.0
1.4.10
1.4.9
1.4.8
1.4.7
1.4.6
1.4.5
1.4.4
1.4.3
1.4.2
1.4.1
1.4.0
1.3.3
1.3.2
1.3.1
1.3.0
1.2.1
1.2.0
1.1.1
1.1.0
1.0.0
0.3.3
0.3.2
0.3.2-rc2
0.3.1
v1.4.10
v1.4.7
v1.4.4
No related merge requests found
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
user_api.py
juser/user_api.py
+1
-1
views.py
juser/views.py
+2
-2
No files found.
juser/user_api.py
View file @
0a35f757
...
@@ -183,7 +183,7 @@ def server_del_user(username):
...
@@ -183,7 +183,7 @@ def server_del_user(username):
bash
(
'userdel -r
%
s'
%
username
)
bash
(
'userdel -r
%
s'
%
username
)
def
get_display_msg
(
user
,
password
,
ssh_key_pwd
,
send_mail_need
=
False
):
def
get_display_msg
(
user
,
password
=
''
,
ssh_key_pwd
=
''
,
send_mail_need
=
False
):
if
send_mail_need
:
if
send_mail_need
:
msg
=
u'添加用户
%
s 成功! 用户密码已发送到
%
s 邮箱!'
%
(
user
.
name
,
user
.
email
)
msg
=
u'添加用户
%
s 成功! 用户密码已发送到
%
s 邮箱!'
%
(
user
.
name
,
user
.
email
)
else
:
else
:
...
...
This diff is collapsed.
Click to expand it.
juser/views.py
View file @
0a35f757
...
@@ -175,7 +175,7 @@ def user_add(request):
...
@@ -175,7 +175,7 @@ def user_add(request):
ssh_key_pwd
=
ssh_key_pwd
,
ssh_key_pwd
=
ssh_key_pwd
,
is_active
=
is_active
,
is_active
=
is_active
,
date_joined
=
datetime
.
datetime
.
now
())
date_joined
=
datetime
.
datetime
.
now
())
server_add_user
(
username
,
ssh_key_pwd
)
server_add_user
(
username
=
username
,
ssh_key_pwd
=
ssh_key_pwd
)
user
=
get_object
(
User
,
username
=
username
)
user
=
get_object
(
User
,
username
=
username
)
if
groups
:
if
groups
:
user_groups
=
[]
user_groups
=
[]
...
@@ -192,7 +192,7 @@ def user_add(request):
...
@@ -192,7 +192,7 @@ def user_add(request):
else
:
else
:
if
MAIL_ENABLE
and
send_mail_need
:
if
MAIL_ENABLE
and
send_mail_need
:
user_add_mail
(
user
,
kwargs
=
locals
())
user_add_mail
(
user
,
kwargs
=
locals
())
msg
=
get_display_msg
(
user
,
password
,
ssh_key_pwd
,
send_mail_need
)
msg
=
get_display_msg
(
user
,
password
=
password
,
ssh_key_pwd
=
ssh_key_pwd
,
send_mail_need
=
send_mail_need
)
return
my_render
(
'juser/user_add.html'
,
locals
(),
request
)
return
my_render
(
'juser/user_add.html'
,
locals
(),
request
)
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
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