feat: Show room functional name when editing timeslots (#7075)

* feat: Show functional name in str(Room) * feat: Show func name in edit_timeslots.html * test: Update test_location_options
ietf-tools · Feb 20, 2024 · 5fc0f69 · 5fc0f69
1 parent 52a7076
commit 5fc0f69
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/ietf/meeting/models.py b/ietf/meeting/models.py
@@ -451,8 +451,9 @@ class Room(models.Model):
     # end floorplan-related stuff
 
     def __str__(self):
-        return u"%s size: %s" % (self.name, self.capacity)
-
+        if len(self.functional_name) > 0 and self.functional_name != self.name:
+            return f"{self.name} [{self.functional_name}] (size: {self.capacity})"    
+        return f"{self.name} (size: {self.capacity})"    
 
     def dom_id(self):
         return "room%u" % (self.pk)

diff --git a/ietf/meeting/tests_schedule_forms.py b/ietf/meeting/tests_schedule_forms.py
@@ -140,13 +140,13 @@ def test_location_options(self):
         rendered = str(TimeSlotEditForm(instance=ts)['location'])
         # noinspection PyTypeChecker
         self.assertInHTML(
-            f'<option value="{ts.location.pk}" selected>{ts.location.name} size: None</option>',
+            f'<option value="{ts.location.pk}" selected>{ts.location}</option>',
             rendered,
         )
         for room in rooms:
             # noinspection PyTypeChecker
             self.assertInHTML(
-                f'<option value="{room.pk}">{room.name} size: {room.capacity}</option>',
+                f'<option value="{room.pk}">{room}</option>',
                 rendered,
             )
 

diff --git a/ietf/templates/meeting/timeslot_edit.html b/ietf/templates/meeting/timeslot_edit.html
@@ -121,6 +121,7 @@ <h1>
                             <tr>
                                 <th scope="row">
                                     <span class="room-heading">{{ room.name }}
+                                        {% if room.functional_name and room.name != room.functional_name %} - {{ room.functional_name }}{% endif %}
                                         {% if room.capacity %}<span class="capacity">({{ room.capacity }})</span>{% endif %}
                                     </span>
                                 </th>