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
fb1c17dc
Commit
fb1c17dc
authored
Mar 01, 2015
by
guanghongwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
da1beef9
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
7 deletions
+11
-7
views.py
jperm/views.py
+1
-1
mytags.py
jumpserver/templatetags/mytags.py
+6
-5
views.py
jumpserver/views.py
+2
-0
nav_li_profile.html
templates/nav_li_profile.html
+2
-1
No files found.
jperm/views.py
View file @
fb1c17dc
...
...
@@ -51,7 +51,7 @@ def perm_list(request):
contacts
=
paginator
.
page
(
current_page
)
except
(
EmptyPage
,
InvalidPage
):
contacts
=
paginator
.
page
(
paginator
.
num_pages
)
return
render_to_response
(
'jperm/perm_list.html'
,
locals
())
return
render_to_response
(
'jperm/perm_list.html'
,
locals
()
,
context_instance
=
RequestContext
(
request
)
)
def
user_asset_cmd_groups_get
(
user_groups_select
=
''
,
asset_groups_select
=
''
,
cmd_groups_select
=
''
):
...
...
jumpserver/templatetags/mytags.py
View file @
fb1c17dc
...
...
@@ -111,11 +111,12 @@ def filter_private(group):
@register.filter
(
name
=
'to_name'
)
def
to_name
(
user_id
):
user
=
User
.
objects
.
filter
(
id
=
user_id
)
if
user
:
user
=
user
[
0
]
return
user
.
name
else
:
try
:
user
=
User
.
objects
.
filter
(
id
=
int
(
user_id
))
if
user
:
user
=
user
[
0
]
return
user
.
name
except
:
return
'非法用户'
@register.filter
(
name
=
'to_role_name'
)
...
...
jumpserver/views.py
View file @
fb1c17dc
...
...
@@ -50,6 +50,8 @@ def getDaysByNum(num):
li_str
.
reverse
()
t
=
(
li_date
,
li_str
)
return
t
def
base
(
request
):
return
render_to_response
(
'base.html'
,
context_instance
=
RequestContext
(
request
))
...
...
templates/nav_li_profile.html
View file @
fb1c17dc
{% load mytags %}
<li
class=
"nav-header"
>
<div
class=
"dropdown profile-element"
>
<span>
<img
alt=
"image"
class=
"img-circle"
width=
"64"
height=
"64"
src=
"/static/img/{{ role_id | to_avatar }}.png"
/>
{#
<img
alt=
"image"
class=
"img-circle"
width=
"64"
height=
"64"
src=
"/static/img/{{ role_id | to_avatar }}.png"
/>
#}
<img
alt=
"image"
class=
"img-circle"
src=
"/static/img/profile_small.jpg"
>
</span>
<a
data-toggle=
"dropdown"
class=
"dropdown-toggle"
href=
"#"
>
<span
class=
"clear"
>
<span
class=
"block m-t-xs"
>
<strong
class=
"font-bold"
>
{{ user_id | to_name}}
</strong>
...
...
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