From c3ed952b5fe3155e61c38a0ba4518a4867877535 Mon Sep 17 00:00:00 2001
From: wkoot <3715211+wkoot@users.noreply.github.com>
Date: Wed, 12 Feb 2025 23:30:55 +0100
Subject: [PATCH] Fix model detail view listing of linked objects (#56)

Closes #55

Signed-off-by: wkoot <3715211+wkoot@users.noreply.github.com>
---
 CHANGELOG.md                                  |  4 ++
 .../templates/netbox_slm/softwarelicense.html | 16 +++----
 .../templates/netbox_slm/softwareproduct.html | 48 ++++++++++++++-----
 .../softwareproductinstallation.html          | 32 +++++++++----
 .../netbox_slm/softwareproductversion.html    | 40 +++++++++++++---
 5 files changed, 104 insertions(+), 36 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 20503c9..6ea93ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,10 @@
 
 * Support NetBox v4.2.3 (#51)
 
+### Fixed
+
+* Model detail view listing of linked objects (#55)
+
 ## [1.7.0](https://github.com/ICTU/netbox_slm/releases/tag/1.7.0) - 2024-07-09
 
 ### Changed
diff --git a/netbox_slm/templates/netbox_slm/softwarelicense.html b/netbox_slm/templates/netbox_slm/softwarelicense.html
index b70bf91..0170edb 100644
--- a/netbox_slm/templates/netbox_slm/softwarelicense.html
+++ b/netbox_slm/templates/netbox_slm/softwarelicense.html
@@ -42,11 +42,11 @@
                 </tr>
                 <tr>
                     <th scope="row">Software Product</th>
-                    <td>{{ object.software_product }}</td>
+                    <td>{{ object.software_product|linkify }}</td>
                 </tr>
                 <tr>
                     <th scope="row">Version</th>
-                    <td>{{ object.version }}</td>
+                    <td>{{ object.version|linkify }}</td>
                 </tr>
                 <tr>
                     <th scope="row">Support</th>
@@ -58,19 +58,19 @@
                 </tr>
                 <tr>
                     <th scope="row">Installation</th>
-                    <td>{{ object.installation }}</td>
+                    <td>{{ object.installation|linkify }}</td>
                 </tr>
             </table>
         </div>
-        {% include 'inc/panels/custom_fields.html' %}
-        {% include 'inc/panels/tags.html' %}
-        {% include 'inc/panels/comments.html' %}
-        {% plugin_left_page object %}
+{% include 'inc/panels/custom_fields.html' %}
+{% include 'inc/panels/tags.html' %}
+{% include 'inc/panels/comments.html' %}
+{% plugin_left_page object %}
     </div>
 </div>
 <div class="row">
     <div class="col col-md-12">
-        {% plugin_full_width_page object %}
+{% plugin_full_width_page object %}
     </div>
 </div>
 {% endblock %}
diff --git a/netbox_slm/templates/netbox_slm/softwareproduct.html b/netbox_slm/templates/netbox_slm/softwareproduct.html
index 65cc24a..0337c94 100644
--- a/netbox_slm/templates/netbox_slm/softwareproduct.html
+++ b/netbox_slm/templates/netbox_slm/softwareproduct.html
@@ -22,31 +22,55 @@
                 </tr>
                 <tr>
                     <th scope="row">Manufacturer</th>
-                    <td>{{ object.manufacturer }}</td>
+                    <td>{{ object.manufacturer|linkify }}</td>
                 </tr>
                 <tr>
                     <th scope="row">Versions</th>
                     <td>
-                    {% for version in object.softwareproduct_versions.all %}
-                        <a href="{% url 'plugins:netbox_slm:softwareproductversion' pk=version.pk %}">
-                            <span class="badge" style="color: #ffffff; background-color: #9e9e9e">{{ version }}</span>
+{% for version in object.softwareproductversion_set.all %}
+                        <a href="{% url 'plugins:netbox_slm:softwareproductversion' pk=version.pk %}" class="btn btn-sm">
+                            {{ version }}
                         </a>
-                    {% empty %}
-                        n/a
-                    {% endfor %}
+{% empty %}
+                        None
+{% endfor %}
+                    </td>
+                </tr>
+                <tr>
+                    <th scope="row">Installations</th>
+                    <td>
+{% for installation in object.softwareproductinstallation_set.all %}
+                        <a href="{% url 'plugins:netbox_slm:softwareproductinstallation' pk=installation.pk %}" class="btn btn-sm">
+                            {{ installation }}
+                        </a>
+{% empty %}
+                        None
+{% endfor %}
+                    </td>
+                </tr>
+                <tr>
+                    <th scope="row">Licenses</th>
+                    <td>
+{% for license in object.softwarelicense_set.all %}
+                        <a href="{% url 'plugins:netbox_slm:softwarelicense' pk=license.pk %}" class="btn btn-sm">
+                            {{ license }}
+                        </a>
+{% empty %}
+                        None
+{% endfor %}
                     </td>
                 </tr>
             </table>
         </div>
-        {% include 'inc/panels/custom_fields.html' %}
-        {% include 'inc/panels/tags.html' %}
-        {% include 'inc/panels/comments.html' %}
-        {% plugin_left_page object %}
+{% include 'inc/panels/custom_fields.html' %}
+{% include 'inc/panels/tags.html' %}
+{% include 'inc/panels/comments.html' %}
+{% plugin_left_page object %}
     </div>
 </div>
 <div class="row">
     <div class="col col-md-12">
-        {% plugin_full_width_page object %}
+{% plugin_full_width_page object %}
     </div>
 </div>
 {% endblock %}
diff --git a/netbox_slm/templates/netbox_slm/softwareproductinstallation.html b/netbox_slm/templates/netbox_slm/softwareproductinstallation.html
index 735e7f5..ddc35b8 100644
--- a/netbox_slm/templates/netbox_slm/softwareproductinstallation.html
+++ b/netbox_slm/templates/netbox_slm/softwareproductinstallation.html
@@ -15,38 +15,50 @@
 {% if object.device %}
                 <tr>
                     <th scope="row">Device</th>
-                    <td>{{ object.device }}</td>
+                    <td>{{ object.device|linkify }}</td>
                 </tr>
 {% elif object.virtualmachine %}
                 <tr>
                     <th scope="row">Virtualmachine</th>
-                    <td>{{ object.virtualmachine }}</td>
+                    <td>{{ object.virtualmachine|linkify }}</td>
                 </tr>
 {% else %}
                 <tr>
                     <th scope="row">Cluster</th>
-                    <td>{{ object.cluster }}</td>
+                    <td>{{ object.cluster|linkify }}</td>
                 </tr>
 {% endif %}
                 <tr>
                     <th scope="row">Software Product</th>
-                    <td>{{ object.software_product }}</td>
+                    <td>{{ object.software_product|linkify }}</td>
                 </tr>
                 <tr>
                     <th scope="row">Version</th>
-                    <td>{{ object.version }}</td>
+                    <td>{{ object.version|linkify }}</td>
+                </tr>
+                <tr>
+                    <th scope="row">Licenses</th>
+                    <td>
+{% for license in object.softwarelicense_set.all %}
+                        <a href="{% url 'plugins:netbox_slm:softwarelicense' pk=license.pk %}" class="btn btn-sm">
+                            {{ license }}
+                        </a>
+{% empty %}
+                        None
+{% endfor %}
+                    </td>
                 </tr>
             </table>
         </div>
-        {% include 'inc/panels/custom_fields.html' %}
-        {% include 'inc/panels/tags.html' %}
-        {% include 'inc/panels/comments.html' %}
-        {% plugin_left_page object %}
+{% include 'inc/panels/custom_fields.html' %}
+{% include 'inc/panels/tags.html' %}
+{% include 'inc/panels/comments.html' %}
+{% plugin_left_page object %}
     </div>
 </div>
 <div class="row">
     <div class="col col-md-12">
-        {% plugin_full_width_page object %}
+{% plugin_full_width_page object %}
     </div>
 </div>
 {% endblock %}
diff --git a/netbox_slm/templates/netbox_slm/softwareproductversion.html b/netbox_slm/templates/netbox_slm/softwareproductversion.html
index 5477351..3cc2ca1 100644
--- a/netbox_slm/templates/netbox_slm/softwareproductversion.html
+++ b/netbox_slm/templates/netbox_slm/softwareproductversion.html
@@ -16,6 +16,14 @@
                     <th scope="row">Name</th>
                     <td>{{ object.name }}</td>
                 </tr>
+                <tr>
+                    <th scope="row">Software Product</th>
+                    <td>{{ object.software_product|linkify }}</td>
+                </tr>
+                <tr>
+                    <th scope="row">Manufacturer</th>
+                    <td>{{ object.software_product.manufacturer|linkify }}</td>
+                </tr>
                 <tr>
                     <th scope="row">Release date</th>
                     <td>{{ object.release_date }}</td>
@@ -50,19 +58,39 @@
                 </tr>
                 <tr>
                     <th scope="row">Installations</th>
-                    <td>{{ object.get_installation_count }}</td>
+                    <td>
+{% for installation in object.softwareproductinstallation_set.all %}
+                        <a href="{% url 'plugins:netbox_slm:softwareproductinstallation' pk=installation.pk %}" class="btn btn-sm">
+                            {{ installation }}
+                        </a>
+{% empty %}
+                        None
+{% endfor %}
+                    </td>
+                </tr>
+                <tr>
+                    <th scope="row">Licenses</th>
+                    <td>
+{% for license in object.softwarelicense_set.all %}
+                        <a href="{% url 'plugins:netbox_slm:softwarelicense' pk=license.pk %}" class="btn btn-sm">
+                            {{ license }}
+                        </a>
+{% empty %}
+                        None
+{% endfor %}
+                    </td>
                 </tr>
             </table>
         </div>
-        {% include 'inc/panels/custom_fields.html' %}
-        {% include 'inc/panels/tags.html' %}
-        {% include 'inc/panels/comments.html' %}
-        {% plugin_left_page object %}
+{% include 'inc/panels/custom_fields.html' %}
+{% include 'inc/panels/tags.html' %}
+{% include 'inc/panels/comments.html' %}
+{% plugin_left_page object %}
     </div>
 </div>
 <div class="row">
     <div class="col col-md-12">
-        {% plugin_full_width_page object %}
+{% plugin_full_width_page object %}
     </div>
 </div>
 {% endblock %}