Move helpers for the admin on IdSubmissionDetail to admin.py

- Legacy-Id: 6657

ietf/submit/admin.py

@@ -1,5 +1,7 @@
 from django.core.urlresolvers import reverse as urlreverse
 from django.contrib import admin
+from django.utils.safestring import mark_safe
+
 from ietf.submit.models import *
 
 class IdSubmissionStatusAdmin(admin.ModelAdmin):
@@ -19,6 +21,13 @@ class IdSubmissionDetailAdmin(admin.ModelAdmin):
         return '<a href="%s">%s</a>' % (url, instance.status)
     status_link.allow_tags = True
 
+    def draft_link(self, instance):
+        if instance.status_id in (-1, -2):
+            return '<a href="http://www.ietf.org/id/%s-%s.txt">%s</a>' % (instance.filename, instance.revision, instance.filename)
+        else:
+            return instance.filename
+    draft_link.allow_tags = True
+
 admin.site.register(IdSubmissionDetail, IdSubmissionDetailAdmin)
 
 class PreapprovalAdmin(admin.ModelAdmin):

ietf/submit/models.py

@@ -57,15 +57,6 @@ class IdSubmissionDetail(models.Model):
             self.create_hash()
             self.save()
         return self.submission_hash
-    def draft_link(self):
-        if self.status_id == -1:
-            return '<a href="http://www.ietf.org/id/%s-%s.txt">%s</a>' % (self.filename, self.revision, self.filename)
-        else:
-            return self.filename
-    draft_link.allow_tags = True
-    def status_link(self):
-        return '<a href="http://datatracker.ietf.org/submit/status/%s/%s/">%s</a>' % (self.submission_id, self.submission_hash, self.status)
-    status_link.allow_tags = True
 
 def create_submission_hash(sender, instance, **kwargs):
     instance.create_hash()