Display a more helpful error when room is missing

Fixes #2178
Uninett · Aug 27, 2020 · 3670933 · 3670933
1 parent fa8391b
commit 3670933
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/python/nav/web/navlets/pdu.py b/python/nav/web/navlets/pdu.py
@@ -48,7 +48,12 @@ def get_context_data_view(self, context):
         if not roomid:
             return context
 
-        room = Room.objects.get(pk=roomid)
+        try:
+            room = Room.objects.get(pk=roomid)
+        except Room.DoesNotExist:
+            context["doesnotexist"] = roomid
+            return context
+
         pdus = room.netbox_set.filter(category='POWER').filter(
             sensor__internal_name__startswith='rPDULoadStatusLoad'
         ).prefetch_related('sensor_set').distinct()

diff --git a/python/nav/web/templates/navlets/pdu_view.html b/python/nav/web/templates/navlets/pdu_view.html
@@ -44,10 +44,16 @@
     </script>
 
   {% else %}
-    <div class="alert-box">
-      <a href="#" class="configure-link">Choose which room</a> to show pdu status for
-    </div>
-
+      {% if doesnotexist %}
+          <div class="alert-box error">
+              The room <q>{{ doesnotexist }}</q> no longer exists.
+              <a href="#" class="configure-link">Choose a new room</a> to show pdu status for.
+          </div>
+      {% else %}
+        <div class="alert-box">
+          <a href="#" class="configure-link">Choose which room</a> to show pdu status for
+        </div>
+      {% endif %}
     <script>
      (function(){
          var $navlet = $('[data-id=' + {{ navlet.navlet_id }}+ ']');