github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Modify some bug

pull/530/head
ibuler 2016-09-05 23:42:10 +08:00
parent 6aedfb5219
commit 3c6f50b788
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/templates/_user_profile.html
View File

@ -11,7 +11,7 @@
<strong class="font-bold"> {{ user.name }}<span style="color: #8095a8"></span></strong> <strong class="font-bold"> {{ user.name }}<span style="color: #8095a8"></span></strong>
</span> </span>
<span class="text-muted text-xs block"> <span class="text-muted text-xs block">
{{ user.get_role_display | default:_('User') }}<b class="caret"></b> {{ user.get_role_display | default:{% trans 'User' %} }}<b class="caret"></b>
</span> </span>
</span> </span>
</a> </a>

3
apps/users/views.py
View File

@ -116,8 +116,7 @@ class UserDetailView(AdminUserRequiredMixin, DetailView):
context_object_name = "user" context_object_name = "user"
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
groups = [ groups = [group for group in UserGroup.objects.iterator() if group not in self.object.groups.iterator()]
group for group in UserGroup.objects.iterator() if group not in self.object.groups.iterator()]
context = {'app': _('Users'), 'action': _('User detail'), 'groups': groups} context = {'app': _('Users'), 'action': _('User detail'), 'groups': groups}
kwargs.update(context) kwargs.update(context)
return super(UserDetailView, self).get_context_data(**kwargs) return super(UserDetailView, self).get_context_data(**kwargs)