move room detection to room uuid

Kunsi · Oct 31, 2024 · dfa0945 · dfa0945
1 parent 6a3b1b3
commit dfa0945
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 28 deletions.
diff --git a/pretalx_broadcast_tools/static/pretalx_broadcast_tools/generic.js b/pretalx_broadcast_tools/static/pretalx_broadcast_tools/generic.js
@@ -61,14 +61,16 @@ function get_next_talk() {
 }
 
 function get_room_name() {
-    room_name = null;
     try {
         hash = decodeURIComponent(window.location.hash.substring(1));
-        room_name = hash;
     } catch (e) {
         console.error(e);
     }
-    return room_name;
+    if (event_info && event_info["rooms"].hasOwnProperty(hash)) {
+        return event_info["rooms"][hash];
+    }
+    // XXX remove fallback when releasing 3.0.0
+    return hash;
 }
 
 function format_time_from_pretalx(from_pretalx) {

diff --git a/pretalx_broadcast_tools/templates/pretalx_broadcast_tools/orga.html b/pretalx_broadcast_tools/templates/pretalx_broadcast_tools/orga.html
@@ -7,25 +7,23 @@
 
         <h2>{% translate "broadcasting tools" %}</h2>
 
-        {% if localized_rooms %}
-            <table class="table table-hover">
-                <thead class="thead-light">
+        <table class="table table-hover">
+            <thead class="thead-light">
+                <tr>
+                    <th scope="col">{% translate "room" %}</th>
+                    <th scope="col" colspan="2">{% translate "Feature" %}</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for room in request.event.rooms.all %}
                     <tr>
-                        <th scope="col">{% translate "room" %}</th>
-                        <th scope="col" colspan="2">{% translate "Feature" %}</th>
+                        <th scope="row">{{ room.name }}</th>
+                        <td><a href="{% url 'plugins:pretalx_broadcast_tools:lowerthirds' request.event.slug %}#{{ room.uuid }}">{% translate "Lower Thirds" %}</a></td>
+                        <td><a href="{% url 'plugins:pretalx_broadcast_tools:room_info' request.event.slug %}#{{ room.uuid }}">{% translate "Room Info" %}</a></td>
                     </tr>
-                </thead>
-                <tbody>
-                    {% for room in localized_rooms %}
-                        <tr>
-                            <th scope="row">{{ room }}</th>
-                            <td><a href="{% url 'plugins:pretalx_broadcast_tools:lowerthirds' request.event.slug %}#{{ room }}">{% translate "Lower Thirds" %}</a></td>
-                            <td><a href="{% url 'plugins:pretalx_broadcast_tools:room_info' request.event.slug %}#{{ room }}">{% translate "Room Info" %}</a></td>
-                        </tr>
-                    {% endfor %}
-                </tbody>
-            </table>
-        {% endif %}
+                {% endfor %}
+            </tbody>
+        </table>
 
         <h2>{% translate "Placeholders" %}</h2>
         <p>{% translate "pretalx will automatically replace some placeholders in your custom content:" %}</p>

diff --git a/pretalx_broadcast_tools/views/event_info.py b/pretalx_broadcast_tools/views/event_info.py
@@ -21,6 +21,10 @@ def get(self, request, *args, **kwargs):
                         else False
                     ),
                 },
+                "rooms": {
+                    str(room.uuid): room.name.localize(self.request.event.locale)
+                    for room in self.request.event.rooms.all()
+                },
                 "slug": self.request.event.slug,
                 "start": self.request.event.date_from.isoformat(),
                 "end": self.request.event.date_to.isoformat(),

diff --git a/pretalx_broadcast_tools/views/orga.py b/pretalx_broadcast_tools/views/orga.py
@@ -12,14 +12,6 @@ class BroadcastToolsOrgaView(PermissionRequired, FormView):
     def get_success_url(self):
         return self.request.path
 
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context["localized_rooms"] = [
-            room.name.localize(self.request.event.locale)
-            for room in self.request.event.rooms.all()
-        ]
-        return context
-
     def form_valid(self, form):
         form.save()
         return super().form_valid(form)