Merge 0ef8693 into 1325089

serrano/admin.py

@@ -1,4 +1,20 @@
 from django.contrib import admin
 from .models import ApiToken
 
-admin.site.register(ApiToken)
+
+class ApiTokenAdmin(admin.ModelAdmin):
+    list_display = ('user', 'token', 'revoked', 'created')
+    list_editable = ('revoked',)
+    list_filter = ('user', 'revoked')
+    fields = ('user', 'token_display', 'revoked')
+    readonly_fields = ('token_display',)
+
+    def token_display(self, instance):
+        if instance.pk:
+            return instance.token
+        return '<em>(displayed once saved)</em>'
+
+    token_display.short_description = 'Token'
+    token_display.allow_tags = True
+
+admin.site.register(ApiToken, ApiTokenAdmin)

serrano/models.py

@@ -19,7 +19,7 @@ def get_active_token(self, token):
 class ApiToken(models.Model):
     "Token for use as authentication for API access."
     user = models.ForeignKey(User)
-    token = models.CharField(max_length=32)
+    token = models.CharField(max_length=32, editable=False)
     revoked = models.BooleanField(default=False)
     created = models.DateTimeField(auto_now_add=True)
     modified = models.DateTimeField(auto_now=True)
@@ -35,4 +35,4 @@ def __unicode__(self):
     def save(self, *args, **kwargs):
         if not self.token:
             self.token = generate_random_token(32, test=unique_token)
-        return super(self.__class__, self).save(*args, **kwargs)
+        return super(ApiToken, self).save(*args, **kwargs)