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
46720dcf
Commit
46720dcf
authored
Jan 14, 2015
by
ibuler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
f592e464
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
4 deletions
+7
-4
mytags.py
jumpserver/templatetags/mytags.py
+5
-2
views.py
juser/views.py
+1
-1
user_list.html
templates/juser/user_list.html
+1
-1
No files found.
jumpserver/templatetags/mytags.py
View file @
46720dcf
import
time
import
time
from
django
import
template
from
django
import
template
from
juser.models
import
User
register
=
template
.
Library
()
register
=
template
.
Library
()
...
@@ -22,8 +23,9 @@ def get_value(dicts, key):
...
@@ -22,8 +23,9 @@ def get_value(dicts, key):
return
dicts
.
get
(
key
,
''
)
return
dicts
.
get
(
key
,
''
)
@register.filter
(
name
=
'groups_str'
)
@register.filter
(
name
=
'groups_str'
)
def
groups_str
(
group_list
):
def
groups_str
(
username
):
groups
=
[]
groups
=
[]
for
group
in
group_list
:
user
=
User
.
objects
.
get
(
username
=
username
)
for
group
in
user
.
user_group
.
all
():
groups
.
append
(
group
.
name
)
groups
.
append
(
group
.
name
)
return
','
.
join
(
groups
)
return
','
.
join
(
groups
)
\ No newline at end of file
juser/views.py
View file @
46720dcf
...
@@ -304,7 +304,7 @@ def user_add(request):
...
@@ -304,7 +304,7 @@ def user_add(request):
if
LDAP_ENABLE
:
if
LDAP_ENABLE
:
ldap_add_user
(
username
,
ldap_pwd
)
ldap_add_user
(
username
,
ldap_pwd
)
msg
=
u'添加用户
%
s 成功!'
%
username
msg
=
u'添加用户
%
s 成功!'
%
username
locals
=
lambda
:
{}
#
locals = lambda: {}
except
Exception
,
e
:
except
Exception
,
e
:
error
=
u'添加用户
%
s 失败
%
s '
%
(
username
,
e
)
error
=
u'添加用户
%
s 失败
%
s '
%
(
username
,
e
)
...
...
templates/juser/user_list.html
View file @
46720dcf
...
@@ -57,7 +57,7 @@
...
@@ -57,7 +57,7 @@
<td>
{{ user.id }}
</td>
<td>
{{ user.id }}
</td>
<td>
{{ user.username }}
</td>
<td>
{{ user.username }}
</td>
<td>
{{ user.name }}
</td>
<td>
{{ user.name }}
</td>
<td>
{{ user.user
_group.all
|groups_str }}
</td>
<td>
{{ user.user
name
|groups_str }}
</td>
<td>
{{ user_roler|get_value:user.role }}
</td>
<td>
{{ user_roler|get_value:user.role }}
</td>
<td>
{{ user.email }}
</td>
<td>
{{ user.email }}
</td>
<td>
{{ user.is_active }}
</td>
<td>
{{ user.is_active }}
</td>
...
...
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