Changeset ef9382 in indico

Timestamp:

05/12/10 15:52:26 (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, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

a9b495

Parents:

53b65f

git-author:

Leszek Syroka <leszek.marek.syroka@…> (05/12/10 14:56:41)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (05/12/10 15:52:26)

Message:

[FIX] Editing session properties room

• session room is displayed correctly even if not belongs to the CERN location -fix#373

Location:

indico/MaKaC

Files:

• services/implementation/roomBooking.py (modified) (1 diff)
• webinterface/tpls/EventLocationInfo.tpl (modified) (1 diff)

indico/MaKaC/services/implementation/roomBooking.py

@@ -55 +55 @@
         if Location.parse( self._location ):
             for room in CrossLocationQueries.getRooms( location = self._location ):
-                res.append((room.getFullName(), room.getFullName()))
+                res.append((room.name, room.getFullName()))
 
-        return sorted(res)
+        return res
 
 class RoomBookingListLocationsAndRooms( ServiceBase ):

indico/MaKaC/webinterface/tpls/EventLocationInfo.tpl

@@ -36 +36 @@
   <% end %>
 
-  var rbWidget = new RoomBookingWidget(Indico.Data.Locations, info, parentEvt, nullRoomInfo(info), <%= eventFavorites %>, Indico.Data.DefaultLocation);
+  var rbWidget = new RoomBookingWidget(Indico.Data.Locations, info, parentEvt, nullRoomInfo(info), <%= eventFavorites %>, <% if modifying: %>null<%end%><%else:%>Indico.Data.DefaultLocation<%end%>);
 
   var domContent = rbWidget.draw();