workaround for printing address ranges with the hi and lo swapped

svn path=/portal-gui/rpkigui/myrpki/models.py; revision=3338

2 files changed, 10 insertions, 3 deletions

diff --git a/portal-gui/rpkigui/myrpki/models.py b/portal-gui/rpkigui/myrpki/models.py
index 551508d2..9a6952ce 100644
--- a/portal-gui/rpkigui/myrpki/models.py
+++ b/portal-gui/rpkigui/myrpki/models.py
@@ -1,5 +1,7 @@
 # $Id$
 
+import socket
+
 from django.db import models
 from django.contrib.auth.models import User
 from rpkigui.myrpki.misc import str_to_range
@@ -47,8 +49,12 @@ class AddressRange(models.Model):
         try:
             # pretty print cidr
             return unicode(str_to_range(self.lo, self.hi))
-        except socket.error:
-            return u'%s - %s' % (self.lo, self.hi)
+        except socket.error, err:
+            print err
+        # work around for bug when hi/lo get reversed
+        except AssertionError, err:
+            print err
+        return u'%s - %s' % (self.lo, self.hi)
 
     def get_absolute_url(self):
         return u'/myrpki/address/%d' % (self.pk,)
diff --git a/portal-gui/rpkigui/templates/myrpki/prefix_view.html b/portal-gui/rpkigui/templates/myrpki/prefix_view.html
index f700ef72..a41af7c9 100644
--- a/portal-gui/rpkigui/templates/myrpki/prefix_view.html
+++ b/portal-gui/rpkigui/templates/myrpki/prefix_view.html
@@ -53,6 +53,7 @@
 <p>Action:
 <a href="{{addr.get_absolute_url}}/split">split</a> |
 <a href="{{addr.get_absolute_url}}/allocate">give to child</a> |
-<a href="{{addr.get_absolute_url}}/roa">edit allowed originators</a>
+<a href="{{addr.get_absolute_url}}/roa">edit allowed originators</a> |
+<a href="{{addr.get_absolute_url}}/delete">delete</a>
 
 {% endblock %}