Merge remote-tracking branch 'origin/stable'

Author: danlipert

app/grants/admin.py

@@ -18,6 +18,7 @@
 
 """
 from django.contrib import admin
+from django.utils.html import format_html
 from django.utils.safestring import mark_safe
 
 from grants.models import CLRMatch, Contribution, Grant, MatchPledge, PhantomFunding, Subscription
@@ -180,6 +181,21 @@ def error_email_copy_not_active(self, instance):
 class ContributionAdmin(GeneralAdmin):
     """Define the Contribution administration layout."""
     raw_id_fields = ['subscription']
+    list_display = ['id', 'txn_url', 'profile', 'created_on', 'amount', 'token', 'tx_cleared', 'success']
+
+    def txn_url(self, obj):
+        tx_id = obj.tx_id
+        tx_url = 'https://etherscan.io/tx/' + tx_id
+        return format_html("<a href='{}' target='_blank'>{}</a>", tx_url, tx_id)
+
+    def profile(self, obj):
+        return obj.subscription.contributor_profile
+
+    def token(self, obj):
+        return obj.subscription.token_symbol
+
+    def amount(self, obj):
+        return obj.subscription.amount_per_period
 
 
 admin.site.register(PhantomFunding, GeneralAdmin)