Merge pull request #2990 from jumpserver/dev

Dev

Merge pull request #2990 from jumpserver/dev
Dev
48cfc4d4 · BaiJiangJie · GitHub · 6f9528d7 · 1f5cc1ee · 48cfc4d4
Unverified Commit 48cfc4d4 authored Jul 18, 2019 by BaiJiangJie Committed by GitHub Jul 18, 2019
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

asset_permission.py apps/perms/models/asset_permission.py +1 -1

No files found.
--- a/apps/perms/models/asset_permission.py
+++ b/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