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

[Bugfix] 修复session搜索bug

pull/915/head
ibuler 2018-01-08 15:15:21 +08:00
parent 676d640e70
commit 3f1863151a
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/assets/tasks.py
View File

@ -390,8 +390,8 @@ def push_system_user_period():
for system_user in system_users: for system_user in system_users:
tasks.extend(get_push_system_user_tasks(system_user)) tasks.extend(get_push_system_user_tasks(system_user))
task_name = _("Push system user to cluster assets period: {}->{}").format( task_name = _("Push cluster system users to assets period: {}").format(
cluster.name, ', '.join(s.name for s in system_users) cluster.name
) )
hosts = [asset.hostname for asset in cluster.assets.all()] hosts = [asset.hostname for asset in cluster.assets.all()]
update_or_create_ansible_task( update_or_create_ansible_task(

4
apps/assets/views/asset.py
View File

@ -159,7 +159,7 @@ class AssetUpdateView(AdminUserRequiredMixin, UpdateView):
'action': _('Update asset'), 'action': _('Update asset'),
} }
kwargs.update(context) kwargs.update(context)
return super(AssetUpdateView, self).get_context_data(**kwargs) return super().get_context_data(**kwargs)
class AssetDeleteView(AdminUserRequiredMixin, DeleteView): class AssetDeleteView(AdminUserRequiredMixin, DeleteView):
@ -184,7 +184,7 @@ class AssetDetailView(DetailView):
'system_users_all': SystemUser.objects.all(), 'system_users_all': SystemUser.objects.all(),
} }
kwargs.update(context) kwargs.update(context)
return super(AssetDetailView, self).get_context_data(**kwargs) return super().get_context_data(**kwargs)
@method_decorator(csrf_exempt, name='dispatch') @method_decorator(csrf_exempt, name='dispatch')

8
apps/terminal/views/session.py
View File

@ -1,7 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
from django.views.generic import ListView, UpdateView, DeleteView, DetailView, TemplateView from django.views.generic import ListView
from django.views.generic.edit import SingleObjectMixin from django.views.generic.edit import SingleObjectMixin
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from django.utils import timezone from django.utils import timezone
@ -51,9 +51,9 @@ class SessionListView(AdminUserRequiredMixin, DatetimeSearchMixin, ListView):
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = { context = {
'user_list': utils.get_user_list_from_cache(), 'user_list': utils.get_session_user_list(),
'asset_list': utils.get_asset_list_from_cache(), 'asset_list': utils.get_session_asset_list(),
'system_user_list': utils.get_system_user_list_from_cache(), 'system_user_list': utils.get_session_system_user_list(),
'date_from': self.date_from, 'date_from': self.date_from,
'date_to': self.date_to, 'date_to': self.date_to,
'user': self.user, 'user': self.user,