Changeset d8fdf0 in indico

Timestamp:

06/10/11 14:16:32 (2 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72

Children:

c9dcb1

Parents:

2810d8

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (06/10/11 14:15:45)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (06/10/11 14:16:32)

Message:

[IMP] Search by webcast/recording from map

• see #842

Location:

indico/MaKaC

Files:

• fossils/room.py (modified) (1 diff)
• rb_room.py (modified) (1 diff)
• webinterface/tpls/RoomBookingMapOfRoomsWidget.tpl (modified) (1 diff)

indico/MaKaC/fossils/room.py

@@ -69 +69 @@
 
     def needsAVCSetup(self):
-        """ Setup for for audio and video conference """
+        """ Setup for audio and video conference """
+
+    def hasWebcastRecording(self):
+        """ Setup for webcast/recording """
 
     def getAvailableVC(self):

indico/MaKaC/rb_room.py

@@ -656 +656 @@
         return 'Video conference' in ' '.join( eq )
 
+    # CERN specific; don't bother
+    def hasWebcastRecording( self ):
+        eq = self.getEquipment()
+        if not self.locationName or not eq:
+            return None
+        return 'Webcast/Recording' in ' '.join( eq )
+
     def _eval_str( self, s ):
         ixPrv = 0

indico/MaKaC/webinterface/tpls/RoomBookingMapOfRoomsWidget.tpl

@@ -170 +170 @@
 <% if not forVideoConference: %>
     {label: "<%= _("Video conference") %>", filterType: "room", inputType: "boolean", defaultValue: false, property: "needsAVCSetup", optional: true, defaultValue: false},
+    {label: "<%= _("Webcast/Recording") %>", filterType: "room", inputType: "boolean", defaultValue: false, property: "hasWebcastRecording", optional: true, defaultValue: false},
 <% end %>
     {label: "<%= _("Only public rooms") %>", filterType: "room", inputType: "boolean", property: "isReservable", optional: true, defaultValue:false},