From 3f9e2f0af7ffeb5d9fba21005e434dd3b078d0f1 Mon Sep 17 00:00:00 2001
From: BaiJiangJie <bugatti_it@163.com>
Date: Tue, 24 Sep 2019 16:16:52 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[Bugfix]=20=E7=94=A8=E6=88=B7=E8=BF=9C?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=94=E7=94=A8=E9=A1=B5=E9=9D=A2=EF=BC=8C=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5=E8=BF=9C=E7=A8=8B=E5=BA=94=E7=94=A8=E4=BC=A0=E9=80=92?=
 =?UTF-8?q?=20type=20=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/applications/user_remote_app_list.html            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/applications/templates/applications/user_remote_app_list.html b/apps/applications/templates/applications/user_remote_app_list.html
index 3559232ef..a771e647a 100644
--- a/apps/applications/templates/applications/user_remote_app_list.html
+++ b/apps/applications/templates/applications/user_remote_app_list.html
@@ -49,7 +49,7 @@ function initTable() {
                     $(td).html(hostname);
                 }},
             {targets: 5, createdCell: function (td, cellData, rowData) {
-                    var conn_btn = '<a href="{% url "luna-view" %}?login_to=' +  cellData +'" class="btn btn-xs btn-primary">{% trans "Connect" %}</a>'.replace("{{ DEFAULT_PK }}", cellData);
+                    var conn_btn = '<a href="{% url "luna-view" %}?type=remote_app&login_to=' +  cellData +'" class="btn btn-xs btn-primary">{% trans "Connect" %}</a>'.replace("{{ DEFAULT_PK }}", cellData);
                     $(td).html(conn_btn)
                 }}
         ],

From e805e9cede95974587a2daf3352ed8ae29123756 Mon Sep 17 00:00:00 2001
From: BaiJiangJie <bugatti_it@163.com>
Date: Tue, 24 Sep 2019 16:36:46 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[Update]=20=E4=BC=98=E5=8C=96=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=8E=88=E6=9D=83=E7=9A=84=20RemoteApp=20API=20?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/perms/api/user_remote_app_permission.py | 11 +++---
 apps/perms/mixins.py                         | 37 +-------------------
 2 files changed, 6 insertions(+), 42 deletions(-)

diff --git a/apps/perms/api/user_remote_app_permission.py b/apps/perms/api/user_remote_app_permission.py
index 84518c875..030e760b5 100644
--- a/apps/perms/api/user_remote_app_permission.py
+++ b/apps/perms/api/user_remote_app_permission.py
@@ -14,7 +14,6 @@ from ..utils import (
     parse_remote_app_to_tree_node,
 )
 from ..hands import User, RemoteApp, RemoteAppSerializer, UserGroup, SystemUser
-from ..mixins import RemoteAppFilterMixin
 from .mixin import UserPermissionMixin
 from .. import serializers
 
@@ -26,10 +25,11 @@ __all__ = [
 ]
 
 
-class UserGrantedRemoteAppsApi(RemoteAppFilterMixin, ListAPIView):
+class UserGrantedRemoteAppsApi(ListAPIView):
     permission_classes = (IsOrgAdminOrAppUser,)
     serializer_class = RemoteAppSerializer
-    filter_fields = ['id']
+    filter_fields = ['name', 'id']
+    search_fields = ['name']
 
     def get_object(self):
         user_id = self.kwargs.get('pk', '')
@@ -54,15 +54,14 @@ class UserGrantedRemoteAppsAsTreeApi(UserGrantedRemoteAppsApi):
     serializer_class = TreeNodeSerializer
     permission_classes = (IsOrgAdminOrAppUser,)
 
-    def get_serializer(self, *args, **kwargs):
+    def get_serializer(self, remote_apps=None, *args, **kwargs):
         only_remote_app = self.request.query_params.get('only', '0') == '1'
         tree_root = None
         data = []
         if not only_remote_app:
             tree_root = construct_remote_apps_tree_root()
             data.append(tree_root)
-        queryset = super().get_queryset()
-        for remote_app in queryset:
+        for remote_app in remote_apps:
             node = parse_remote_app_to_tree_node(tree_root, remote_app)
             data.append(node)
         data.sort()
diff --git a/apps/perms/mixins.py b/apps/perms/mixins.py
index f1d7fac1e..30a588ffd 100644
--- a/apps/perms/mixins.py
+++ b/apps/perms/mixins.py
@@ -4,7 +4,7 @@
 from orgs.utils import set_to_root_org
 
 __all__ = [
-    'AssetsFilterMixin', 'RemoteAppFilterMixin', 'ChangeOrgIfNeedMixin',
+    'AssetsFilterMixin', 'ChangeOrgIfNeedMixin',
 ]
 
 
@@ -68,41 +68,6 @@ class AssetsFilterMixin(object):
         return _queryset
 
 
-class RemoteAppFilterMixin(object):
-    """
-    对RemoteApp进行过滤(查询，排序)
-    """
-
-    def filter_queryset(self, queryset):
-        queryset = self.search_remote_apps(queryset)
-        queryset = self.sort_remote_apps(queryset)
-        return queryset
-
-    def search_remote_apps(self, queryset):
-        value = self.request.query_params.get('search')
-        if not value:
-            return queryset
-        queryset = [
-            remote_app for remote_app in queryset if value in remote_app.name
-        ]
-        return queryset
-
-    def sort_remote_apps(self, queryset):
-        order_by = self.request.query_params.get('order')
-        if not order_by:
-            order_by = 'name'
-        if order_by.startswith('-'):
-            order_by = order_by.lstrip('-')
-            reverse = True
-        else:
-            reverse = False
-
-        queryset = sorted(
-            queryset, key=lambda x: getattr(x, order_by), reverse=reverse
-        )
-        return queryset
-
-
 class ChangeOrgIfNeedMixin(object):
 
     @staticmethod