From 04e7f54c69bd6b3858283a6c2874b0e6f136412c Mon Sep 17 00:00:00 2001
From: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com>
Date: Thu, 26 Jul 2018 18:25:44 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20org=20admin=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E8=B5=84=E4=BA=A7=E8=AF=A6=E6=83=85=E5=8F=B3=E4=BE=A7=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=E5=8D=A1=EF=BC=9B=E4=BF=AE=E5=A4=8D=E8=B5=84=E4=BA=A7?=
 =?UTF-8?q?=E6=8E=88=E6=9D=83=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7=EF=BC=8C?=
 =?UTF-8?q?=E4=BC=9A=E6=98=BE=E7=A4=BA=E5=85=B6=E4=BB=96org=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=9A=84bug=20(#1594)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [Bugfix] 修复资产授权添加用户，显示其他org的用户bug

* [Update] org admin 显示资产详情右侧选项卡
---
 apps/assets/templates/assets/asset_detail.html |  2 +-
 apps/perms/views.py                            | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/apps/assets/templates/assets/asset_detail.html b/apps/assets/templates/assets/asset_detail.html
index b07a7c348..2f36688be 100644
--- a/apps/assets/templates/assets/asset_detail.html
+++ b/apps/assets/templates/assets/asset_detail.html
@@ -130,7 +130,7 @@
                                 </div>
                             </div>
                         </div>
-                        {% if user.is_superuser %}
+                        {% if user.is_superuser or user.is_org_admin %}
                         <div class="col-sm-5" style="padding-left: 0;padding-right: 0">
                             <div class="panel panel-primary">
                                 <div class="panel-heading">
diff --git a/apps/perms/views.py b/apps/perms/views.py
index cd2481222..411405848 100644
--- a/apps/perms/views.py
+++ b/apps/perms/views.py
@@ -9,6 +9,7 @@ from django.urls import reverse_lazy
 from django.conf import settings
 
 from common.permissions import AdminUserRequiredMixin
+from orgs.utils import current_org
 from .hands import Node, Asset, SystemUser, User, UserGroup
 from .models import AssetPermission
 from .forms import AssetPermissionForm
@@ -87,7 +88,6 @@ class AssetPermissionDetailView(AdminUserRequiredMixin, DetailView):
             'system_users_remain': SystemUser.objects.exclude(
                 granted_by_permissions=self.object
             ),
-
         }
         kwargs.update(context)
         return super().get_context_data(**kwargs)
@@ -108,7 +108,7 @@ class AssetPermissionUserView(AdminUserRequiredMixin,
     object = None
 
     def get(self, request, *args, **kwargs):
-        self.object = self.get_object(queryset = AssetPermission.objects.all())
+        self.object = self.get_object(queryset=AssetPermission.objects.all())
         return super().get(request, *args, **kwargs)
 
     def get_queryset(self):
@@ -116,11 +116,13 @@ class AssetPermissionUserView(AdminUserRequiredMixin,
         return queryset
 
     def get_context_data(self, **kwargs):
+
         context = {
             'app': _('Perms'),
             'action': _('Asset permission user list'),
-            'users_remain': User.objects.exclude(asset_permissions=self.object)
-                .exclude(role=User.ROLE_APP),
+            'users_remain': current_org.get_org_users().exclude(
+                asset_permissions=self.object
+            ),
             'user_groups_remain': UserGroup.objects.exclude(
                 asset_permissions=self.object
             )