dashboard/templates/unassigned_devices.html

@@ -33,19 +33,7 @@
     <thead>
       <tr>
         <th scope="col" data-sortable="">
-          select
+          <a class="dataTable-sorter" href="#">Title</a>
-        </th>
-        <th scope="col" data-sortable="">
-          shortid
-        </th>
-        <th scope="col" data-sortable="">
-          type
-        </th>
-        <th scope="col" data-sortable="">
-          manufacturer
-        </th>
-        <th scope="col" data-sortable="">
-          model
         </th>
       </tr>
     </thead>
@@ -57,18 +45,9 @@
         </td>
         <td>
           <a href="{% url 'device:details' dev.id %}">
-            {{ dev.shortid }}
+            {{ dev.type }} {{ dev.manufacturer }} {{ dev.model }}
           </a>
         </td>
-        <td>
-            {{ dev.type }}
-        </td>
-        <td>
-            {{ dev.manufacturer }}
-        </td>
-        <td>
-            {{ dev.model }}
-        </td>
       </tr>
     </tbody>
     {% endfor %}

device/models.py

@@ -27,7 +27,6 @@ class Device:
         # the id is the chid of the device
         self.id = kwargs["id"]
         self.pk = self.id
-        self.shortid = self.pk[:6]
         self.algorithm = None
         self.owner = None
         self.annotations =  []

device/templates/details.html

@@ -4,7 +4,7 @@
 {% block content %}
 <div class="row">
   <div class="col">
-    <h3>{{ object.shortid }}</h3>
+    <h3>{{ object.id }}</h3>
   </div>
 </div>