Merge pull request #412 from WikipediaLibrary/kgraessle/add-link-even…

…ts-to-url-patterns-in-django-admin

This moves the django admin relationship display from LinkEvents to U…

extlinks/aggregates/admin.py

@@ -13,6 +13,7 @@ class LinkAggregateAdmin(admin.ModelAdmin):
         "on_user_list",
     )
     list_filter = ("organisation", "collection", "month", "year", "on_user_list")
+    list_select_related = ["organisation", "collection"]
 
 
 admin.site.register(LinkAggregate, LinkAggregateAdmin)
@@ -29,7 +30,7 @@ class UserAggregateAdmin(admin.ModelAdmin):
         "on_user_list",
     )
     list_filter = ("organisation", "collection", "month", "year", "on_user_list")
-
+    list_select_related = ["organisation", "collection"]
 
 admin.site.register(UserAggregate, UserAggregateAdmin)
 
@@ -46,6 +47,6 @@ class PageProjectAggregateAdmin(admin.ModelAdmin):
         "on_user_list",
     )
     list_filter = ("organisation", "collection", "month", "year", "on_user_list")
-
+    list_select_related = ["organisation", "collection"]
 
 admin.site.register(PageProjectAggregate, PageProjectAggregateAdmin)

extlinks/links/admin.py

@@ -1,10 +1,35 @@
 from django.contrib import admin
+from django.contrib.contenttypes.admin import GenericTabularInline
 
 from .models import URLPattern, LinkSearchTotal, LinkEvent
 
 
+class LinkEventURLPatternAdminInline(GenericTabularInline):
+    model = LinkEvent
+    show_change_link = True
+    exclude = ["user_id", "url"]
+    readonly_fields = [
+        "link",
+        "timestamp",
+        "domain",
+        "rev_id",
+        "page_title",
+        "page_namespace",
+        "event_id",
+        "user_is_bot",
+        "hash_link_event_id",
+        "change",
+        "username",
+        "on_user_list",
+    ]
+
+
 class URLPatternAdmin(admin.ModelAdmin):
     list_display = ("url",)
+    exclude = ["collections"]
+    inlines = [
+        LinkEventURLPatternAdminInline,
+    ]
 
 
 admin.site.register(URLPattern, URLPatternAdmin)
@@ -19,6 +44,13 @@ class LinkSearchTotalAdmin(admin.ModelAdmin):
 
 class LinkEventAdmin(admin.ModelAdmin):
     list_display = ("link", "timestamp", "domain", "username", "change")
+    list_select_related = ["username", "content_type"]
+    readonly_fields = ["url_pattern_display", "username"]
+    exclude = ["content_type", "object_id", "url"]
+
+    @admin.display(description="URLPattern")
+    def url_pattern_display(self, instance):
+        return URLPattern.objects.filter(pk=instance.content_object.pk).first()
 
 
 admin.site.register(LinkEvent, LinkEventAdmin)

extlinks/organisations/admin.py

@@ -22,6 +22,7 @@ class OrganisationAdmin(admin.ModelAdmin):
 class CollectionAdmin(admin.ModelAdmin):
     list_display = ("name", "organisation")
     list_filter = ("name", "organisation")
+    list_select_related = ["organisation"]
 
 
 admin.site.register(Collection, CollectionAdmin)