From e20a96333accb6790c89bf8eb8ffce38af9f0ddc Mon Sep 17 00:00:00 2001 From: Ole Laursen Date: Thu, 19 Jan 2012 13:03:59 +0000 Subject: [PATCH] Fix bug with attachment URLs, make the proxy slightly more future proof - Legacy-Id: 3825 --- ietf/liaisons/proxy.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ietf/liaisons/proxy.py b/ietf/liaisons/proxy.py index 069e2b463..22950528c 100644 --- a/ietf/liaisons/proxy.py +++ b/ietf/liaisons/proxy.py @@ -121,7 +121,7 @@ class LiaisonDetailProxy(LiaisonStatement): @property def uploads_set(self): - return UploadsProxy.objects.filter(liaisonstatement=self).order_by('name') + return UploadsProxy.objects.filter(liaisonstatement=self).order_by("name", "external_url") @property def liaisondetail_set(self): @@ -155,10 +155,10 @@ class UploadsProxy(Document): #file_id = models.AutoField(primary_key=True) @property def file_id(self): - if self.external_url.startswith(self.name): + if not self.external_url or self.external_url.startswith(self.name): return self.name # new data else: - return int(self.external_url.split(".")[0][len(file):]) # old data + return int(self.external_url.split(".")[0][len("file"):]) # old data #file_title = models.CharField(blank=True, max_length=255) @property def file_title(self):