Merge pull request #2341 from szok/blade-on-list

Add slot_no column to data center localization list
allegro · Apr 5, 2016 · c53530d · c53530d
2 parents e66d17d + 0507967
commit c53530d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/src/ralph/admin/helpers.py b/src/ralph/admin/helpers.py
@@ -108,5 +108,5 @@ def generate_html_link(base_url, params, label):
     return '<a href="{base_url}?{params}">{label}</a>'.format(
         base_url=base_url,
         params=urlencode(params),
-        label=label
+        label=str(label).replace(' ', '&nbsp;')
     )
diff --git a/src/ralph/data_center/admin.py b/src/ralph/data_center/admin.py
@@ -225,7 +225,7 @@ def localization(self, obj):
         data center, server_room, rack, position (if is blade)
         """
         base_url = reverse('admin:data_center_datacenterasset_changelist')
-        position = '<strong>{}</strong>'.format(obj.position)
+        position = obj.position
         if obj.is_blade:
             position = generate_html_link(
                 base_url,
@@ -234,32 +234,36 @@ def localization(self, obj):
                     'position__start': obj.position,
                     'position__end': obj.position
                 },
-                position
+                position,
             )
 
-        return (
-            '{data_center}/{server_room}/{rack}/{position}'
-        ).format(
-            data_center=generate_html_link(
+        result = [
+            generate_html_link(
                 base_url,
                 {
                     'rack__server_room__data_center':
                         obj.rack.server_room.data_center_id
                 },
                 obj.rack.server_room.data_center.name
             ),
-            server_room=generate_html_link(
+            generate_html_link(
                 base_url,
                 {'rack__server_room': obj.rack.server_room_id},
                 obj.rack.server_room.name
             ),
-            rack=generate_html_link(
+            generate_html_link(
                 base_url,
                 {'rack': obj.rack_id},
                 obj.rack.name
-            ),
-            position=position if obj.position else ''
-        ) if obj.rack else '&mdash;'
+            )
+        ] if obj.rack else []
+
+        if obj.position:
+            result.append(str(position))
+        if obj.slot_no:
+            result.append(str(obj.slot_no))
+
+        return '&nbsp;/&nbsp;'.join(result) if obj.rack else '&mdash;'
 
     localization.short_description = _('Localization')
     localization.allow_tags = True