Change prefix links to new prefix details page.

fixes #1479
Uninett · Mar 10, 2017 · 1cfcd9a · 1cfcd9a
1 parent 998e611
commit 1cfcd9a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/python/nav/netmap/metadata.py b/python/nav/netmap/metadata.py
@@ -325,8 +325,7 @@ def to_json(self):
         if self.layer == 3:
             json.update({'prefix': {
                 'net_address': unicode(self.prefix.net_address),
-                'report_link': reverse('report-prefix-prefix',
-                                       kwargs={'prefix_id': self.prefix.id})
+                'report_link': self.prefix.get_absolute_url(),
             }})
             json.update({'vlan': self.prefix.vlan.id})
         elif self.layer == 2:

diff --git a/templates/info/vlan/vlandetails.html b/templates/info/vlan/vlandetails.html
@@ -118,7 +118,7 @@ <h3>Vlan details</h3>
         {% for prefix in prefixes %}
           <tr>
             <td>
-              <a href="{% url 'report-prefix-prefix' prefix.id %}">
+              <a href="{% url 'prefix-details' prefix.id %}">
                 {{ prefix.net_address }}
               </a>
             </td>

diff --git a/templates/ipdevinfo/frag-ipdevinfo.html b/templates/ipdevinfo/frag-ipdevinfo.html
@@ -126,7 +126,7 @@
         <td>
           {% with netbox.get_filtered_prefix as prefix %}
             {% if prefix %}
-              <a href="{% url 'report-prefix-prefix' prefix.id %}">
+              <a href="{% url 'prefix-details' prefix.id %}">
                 {{ prefix }}</a>
             {% else %}
               N/A
@@ -479,7 +479,7 @@
         <td>
           {% with no_netbox.prefix as prefix %}
             {% if prefix %}
-              <a href="{% url 'report-prefix-prefix' prefix.id %}">
+              <a href="{% url 'prefix-details' prefix.id %}">
                 {{ prefix.net_address }}
               </a>
             {% else %}

diff --git a/templates/ipdevinfo/port-details-vlan-frag.html b/templates/ipdevinfo/port-details-vlan-frag.html
@@ -113,7 +113,7 @@
             <tr>
               <td>{{ gwprefix.gw_ip }}</td>
               <td>
-                <a href="{% url 'report-prefix-prefix' gwprefix.prefix.id %}">{{ gwprefix.prefix.net_address }}</a>
+                <a href="{% url 'prefix-details' gwprefix.prefix.id %}">{{ gwprefix.prefix.net_address }}</a>
               </td>
             </tr>
           {% endfor %}