From 1a5f7105ce67fff6df953933538555b7be9cf151 Mon Sep 17 00:00:00 2001
From: Maksudul Haque <saad.mk112@gmail.com>
Date: Thu, 19 Aug 2021 15:00:52 +0600
Subject: [PATCH 1/2] Added Search and filters for RemoteRepository and
 RemoteOrganization admin list page

---
 readthedocs/oauth/admin.py | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/readthedocs/oauth/admin.py b/readthedocs/oauth/admin.py
index 035dd941ac4..2590c4a052f 100644
--- a/readthedocs/oauth/admin.py
+++ b/readthedocs/oauth/admin.py
@@ -16,7 +16,42 @@ class RemoteRepositoryAdmin(admin.ModelAdmin):
 
     """Admin configuration for the RemoteRepository model."""
 
+    readonly_fields = ('created', 'modified',)
     raw_id_fields = ('organization',)
+    list_select_related = ('organization',)
+    list_filter = ('vcs_provider', 'vcs', 'private',)
+    search_fields = (
+        'name',
+        'full_name',
+        'html_url',
+        'description',
+        'remote_id',
+    )
+    list_display = (
+        'id',
+        'full_name',
+        'html_url',
+        'private',
+        'organization',
+        'get_vcs_provider_display',
+        'get_vcs_display',
+    )
+
+
+class RemoteOrganizationAdmin(admin.ModelAdmin):
+
+    """Admin configuration for the RemoteOrganization model."""
+
+    readonly_fields = ('created', 'modified',)
+    search_fields = ('name', 'slug', 'email', 'url', 'remote_id',)
+    list_filter = ('vcs_provider',)
+    list_display = (
+        'id',
+        'name',
+        'slug',
+        'email',
+        'get_vcs_provider_display',
+    )
 
 
 class RemoteRepositoryRelationAdmin(admin.ModelAdmin):
@@ -37,5 +72,5 @@ class RemoteOrganizationRelationAdmin(admin.ModelAdmin):
 
 admin.site.register(RemoteRepository, RemoteRepositoryAdmin)
 admin.site.register(RemoteRepositoryRelation, RemoteRepositoryRelationAdmin)
-admin.site.register(RemoteOrganization)
+admin.site.register(RemoteOrganization, RemoteOrganizationAdmin)
 admin.site.register(RemoteOrganizationRelation, RemoteOrganizationRelationAdmin)

From 0a845654fe319f2af4b1aa6b43b8dd3b52d40861 Mon Sep 17 00:00:00 2001
From: Maksudul Haque <saad.mk112@gmail.com>
Date: Thu, 19 Aug 2021 20:50:57 +0600
Subject: [PATCH 2/2] Remove description and html_url from search_fields

---
 readthedocs/oauth/admin.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/readthedocs/oauth/admin.py b/readthedocs/oauth/admin.py
index 2590c4a052f..81a790c8b40 100644
--- a/readthedocs/oauth/admin.py
+++ b/readthedocs/oauth/admin.py
@@ -20,13 +20,7 @@ class RemoteRepositoryAdmin(admin.ModelAdmin):
     raw_id_fields = ('organization',)
     list_select_related = ('organization',)
     list_filter = ('vcs_provider', 'vcs', 'private',)
-    search_fields = (
-        'name',
-        'full_name',
-        'html_url',
-        'description',
-        'remote_id',
-    )
+    search_fields = ('name', 'full_name', 'remote_id',)
     list_display = (
         'id',
         'full_name',