Changeset 57b8a9 in indico

Timestamp:

04/30/10 17:16:05 (3 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

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

Children:

d3cb3f

Parents:

b70ffb

Message:

[FIX] Bugs in video services indexing

Location:

indico/MaKaC/plugins/Collaboration

Files:

• CERNMCU/pages.py (modified) (2 diffs)
• RecordingRequest/tpls/Indexing.js (modified) (1 diff)
• WebcastRequest/tpls/Indexing.js (modified) (1 diff)

indico/MaKaC/plugins/Collaboration/CERNMCU/pages.py

@@ -166 +166 @@
         vars = WJSBase.getVars( self )
 
-        vars["ConferenceId"] = self._conf.getId()
-
         roomsWithH323IP = []
 
         if self._conf:
+
+            vars["ConferenceId"] = self._conf.getId()
 
             # Code to get a list of H.323 Videoconference-able rooms
@@ -212 +212 @@
                 except Exception, e:
                     Logger.get("CERNMCU").warning("Location: " + locationName + "Exception when retrieving the list of all rooms with a H323 IP: " + str(e))
+        else:
+            vars["ConferenceId"] = ""
 
         roomsWithH323IP.sort(key = lambda room: room.getLocation()+':'+room.getName())

indico/MaKaC/plugins/Collaboration/RecordingRequest/tpls/Indexing.js

@@ -1 +1 @@
 {
     "customText": function(booking, viewBy) {
-        if (booking.statusMessage == "Request rejected by responsible" && trim(booking.rejectionReason)) {
+        if (booking.statusMessage == "Request rejected by responsible" && booking.rejectionReason && trim(booking.rejectionReason)) {
             return "Rejection reason: " + trim(booking.rejectionReason);
         }

indico/MaKaC/plugins/Collaboration/WebcastRequest/tpls/Indexing.js

@@ -1 +1 @@
 {
     "customText": function(booking, viewBy) {
-        if (booking.statusMessage == "Request rejected by responsible" && trim(booking.rejectionReason)) {
+        if (booking.statusMessage == "Request rejected by responsible" && booking.rejectionReason && trim(booking.rejectionReason)) {
             return "Rejection reason: " + trim(booking.rejectionReason);
         }