diff --git a/jperm/views.py b/jperm/views.py index 0c9ef2392..458469776 100644 --- a/jperm/views.py +++ b/jperm/views.py @@ -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=''): diff --git a/jumpserver/templatetags/mytags.py b/jumpserver/templatetags/mytags.py index 622e633aa..296fa8f1f 100644 --- a/jumpserver/templatetags/mytags.py +++ b/jumpserver/templatetags/mytags.py @@ -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') diff --git a/jumpserver/views.py b/jumpserver/views.py index 28a00f37e..247f8af0d 100644 --- a/jumpserver/views.py +++ b/jumpserver/views.py @@ -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)) diff --git a/templates/nav_li_profile.html b/templates/nav_li_profile.html index c8d714e64..95e73ea12 100644 --- a/templates/nav_li_profile.html +++ b/templates/nav_li_profile.html @@ -1,7 +1,8 @@ {% load mytags %}