Merge branch 'dev' of github.com:jumpserver/jumpserver into 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/perms/models/asset_permission.py

@@ -103,7 +103,7 @@ class AssetPermission(BasePermission):
         if pattern:
             args.append(Q(nodes__key__regex=pattern))
         args = reduce(lambda x, y: x | y, args)
-        assets = Asset.objects.filter(args)
+        assets = Asset.objects.filter(args).distinct()
         return assets