mirror of https://github.com/jumpserver/jumpserver
修改bug
parent
da1beef94d
commit
fb1c17dc51
|
@ -51,7 +51,7 @@ def perm_list(request):
|
||||||
contacts = paginator.page(current_page)
|
contacts = paginator.page(current_page)
|
||||||
except (EmptyPage, InvalidPage):
|
except (EmptyPage, InvalidPage):
|
||||||
contacts = paginator.page(paginator.num_pages)
|
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=''):
|
def user_asset_cmd_groups_get(user_groups_select='', asset_groups_select='', cmd_groups_select=''):
|
||||||
|
|
|
@ -111,11 +111,12 @@ def filter_private(group):
|
||||||
|
|
||||||
@register.filter(name='to_name')
|
@register.filter(name='to_name')
|
||||||
def to_name(user_id):
|
def to_name(user_id):
|
||||||
user = User.objects.filter(id=user_id)
|
try:
|
||||||
if user:
|
user = User.objects.filter(id=int(user_id))
|
||||||
user = user[0]
|
if user:
|
||||||
return user.name
|
user = user[0]
|
||||||
else:
|
return user.name
|
||||||
|
except:
|
||||||
return '非法用户'
|
return '非法用户'
|
||||||
|
|
||||||
@register.filter(name='to_role_name')
|
@register.filter(name='to_role_name')
|
||||||
|
|
|
@ -50,6 +50,8 @@ def getDaysByNum(num):
|
||||||
li_str.reverse()
|
li_str.reverse()
|
||||||
t = (li_date, li_str)
|
t = (li_date, li_str)
|
||||||
return t
|
return t
|
||||||
|
|
||||||
|
|
||||||
def base(request):
|
def base(request):
|
||||||
return render_to_response('base.html', context_instance=RequestContext(request))
|
return render_to_response('base.html', context_instance=RequestContext(request))
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
{% load mytags %}
|
{% load mytags %}
|
||||||
<li class="nav-header">
|
<li class="nav-header">
|
||||||
<div class="dropdown profile-element"> <span>
|
<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>
|
</span>
|
||||||
<a data-toggle="dropdown" class="dropdown-toggle" href="#">
|
<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>
|
<span class="clear"> <span class="block m-t-xs"> <strong class="font-bold">{{ user_id | to_name}}</strong>
|
||||||
|
|
Loading…
Reference in New Issue