From 3f1863151a80119e7a44911cdeaae6eb4bb94af2 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Mon, 8 Jan 2018 15:15:21 +0800
Subject: [PATCH] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8Dsession=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/tasks.py           | 4 ++--
 apps/assets/views/asset.py     | 4 ++--
 apps/terminal/views/session.py | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/assets/tasks.py b/apps/assets/tasks.py
index 3d59fa091..fdd72e8b0 100644
--- a/apps/assets/tasks.py
+++ b/apps/assets/tasks.py
@@ -390,8 +390,8 @@ def push_system_user_period():
         for system_user in system_users:
             tasks.extend(get_push_system_user_tasks(system_user))
 
-        task_name = _("Push system user to cluster assets period: {}->{}").format(
-            cluster.name, ', '.join(s.name for s in system_users)
+        task_name = _("Push cluster system users to assets period: {}").format(
+            cluster.name
         )
         hosts = [asset.hostname for asset in cluster.assets.all()]
         update_or_create_ansible_task(
diff --git a/apps/assets/views/asset.py b/apps/assets/views/asset.py
index b6232436e..1c0e2ce1a 100644
--- a/apps/assets/views/asset.py
+++ b/apps/assets/views/asset.py
@@ -159,7 +159,7 @@ class AssetUpdateView(AdminUserRequiredMixin, UpdateView):
             'action': _('Update asset'),
         }
         kwargs.update(context)
-        return super(AssetUpdateView, self).get_context_data(**kwargs)
+        return super().get_context_data(**kwargs)
 
 
 class AssetDeleteView(AdminUserRequiredMixin, DeleteView):
@@ -184,7 +184,7 @@ class AssetDetailView(DetailView):
             'system_users_all': SystemUser.objects.all(),
         }
         kwargs.update(context)
-        return super(AssetDetailView, self).get_context_data(**kwargs)
+        return super().get_context_data(**kwargs)
 
 
 @method_decorator(csrf_exempt, name='dispatch')
diff --git a/apps/terminal/views/session.py b/apps/terminal/views/session.py
index e0caa9771..087e16b68 100644
--- a/apps/terminal/views/session.py
+++ b/apps/terminal/views/session.py
@@ -1,7 +1,7 @@
 # -*- 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.utils.translation import ugettext as _
 from django.utils import timezone
@@ -51,9 +51,9 @@ class SessionListView(AdminUserRequiredMixin, DatetimeSearchMixin, ListView):
 
     def get_context_data(self, **kwargs):
         context = {
-            'user_list': utils.get_user_list_from_cache(),
-            'asset_list': utils.get_asset_list_from_cache(),
-            'system_user_list': utils.get_system_user_list_from_cache(),
+            'user_list': utils.get_session_user_list(),
+            'asset_list': utils.get_session_asset_list(),
+            'system_user_list': utils.get_session_system_user_list(),
             'date_from': self.date_from,
             'date_to': self.date_to,
             'user': self.user,