Merge pull request #2987 from jumpserver/dev

Dev

apps/assets/templates/assets/admin_user_list.html

@@ -4,7 +4,6 @@
     <div class="alert alert-info help-message">
     {% trans 'Admin users are asset (charged server) on the root, or have NOPASSWD: ALL sudo permissions users, '%}
     {% trans 'Jumpserver users of the system using the user to `push system user`,  `get assets hardware information`, etc. '%}
-    {% trans 'You can set any one for Windows or other hardware.' %}
     </div>
 {% endblock %}
 {% block table_search %}

apps/assets/templates/assets/system_user_list.html

@@ -9,7 +9,7 @@
 {#    目前还不支持Windows的自动推送#}
     {% trans 'System user is Jumpserver jump login assets used by the users, can be understood as the user login assets, such as web, sa, the dba (` ssh web@some-host `), rather than using a user the username login server jump (` ssh xiaoming@some-host `); '%}
     {% trans 'In simple terms, users log into Jumpserver using their own username, and Jumpserver uses system users to log into assets. '%}
-    {% trans 'When system users are created, if you choose auto push Jumpserver to use ansible push system users into the asset, if the asset (Switch) does not support ansible, please manually fill in the account password.' %}
+    {% trans 'When system users are created, if you choose auto push Jumpserver to use Ansible push system users into the asset, if the asset (Switch) does not support ansible, please manually fill in the account password.' %}
     </div>
 {% endblock %}
 

apps/assets/views/asset.py

@@ -5,20 +5,18 @@ from django.contrib import messages
 from django.utils.translation import ugettext_lazy as _
 from django.views.generic import TemplateView, ListView
 from django.views.generic.edit import FormMixin
-from django.views.generic.edit import CreateView, DeleteView, UpdateView
+from django.views.generic.edit import DeleteView, UpdateView
 from django.urls import reverse_lazy
 from django.views.generic.detail import DetailView
 from django.core.cache import cache
 from django.shortcuts import redirect
-from django.contrib.messages.views import SuccessMessageMixin
 from django.forms.formsets import formset_factory
 
 from common.utils import get_object_or_none, get_logger
 from common.permissions import PermissionsMixin, IsOrgAdmin, IsValidUser
-from common.const import (
-    create_success_msg, update_success_msg, KEY_CACHE_RESOURCES_ID
-)
+from common.const import KEY_CACHE_RESOURCES_ID
 from .. import forms
+from ..utils import NodeUtil
 from ..models import Asset, SystemUser, Label, Node
 
 
@@ -198,7 +196,9 @@ class AssetDetailView(PermissionsMixin, DetailView):
         ).select_related('admin_user', 'domain')
 
     def get_context_data(self, **kwargs):
-        nodes_remain = Node.objects.exclude(assets=self.object)
+        nodes_remain = Node.objects.exclude(assets=self.object).only('key')
+        util = NodeUtil()
+        nodes_remain = util.get_nodes_by_queryset(nodes_remain)
         context = {
             'app': _('Assets'),
             'action': _('Asset detail'),

apps/perms/views/asset_permission.py

@@ -10,6 +10,7 @@ from django.conf import settings
 
 from common.permissions import PermissionsMixin, IsOrgAdmin
 from orgs.utils import current_org
+from assets.utils import NodeUtil
 from perms.hands import Node, Asset, SystemUser, UserGroup
 from perms.models import AssetPermission
 from perms.forms import AssetPermissionForm
@@ -163,8 +164,11 @@ class AssetPermissionAssetView(PermissionsMixin,
         return queryset
 
     def get_context_data(self, **kwargs):
-        granted_nodes = self.object.nodes.all()
-        nodes_remain = [n for n in Node.get_queryset() if n not in granted_nodes]
+        nodes_remain = Node.objects.exclude(
+            id__in=self.object.nodes.all().values_list('id', flat=True)
+        ).only('key')
+        util = NodeUtil()
+        nodes_remain = util.get_nodes_by_queryset(nodes_remain)
         context = {
             'app': _('Perms'),
             'action': _('Asset permission asset list'),