Changeset dcf2ba in indico

Timestamp:

08/21/09 17:32:59 (4 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, new-webex, prov-dual-interface, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, b8c30da8ebdbdcbd675a873997cc3e95f567de49, 10eafd9ae230cbad5d99d5aaf22c24724fb6c98f

Children:

a33efc

Parents:

9f94a3f

Message:

[FIXED] issues with room booking in edit breaks

Location:

indico

Files:

• MaKaC/schedule.py (modified) (1 diff)
• htdocs/js/indico/Timetable/Management.js (modified) (2 diffs)

indico/MaKaC/schedule.py

@@ -1117 +1117 @@
     @Retrieves (['MaKaC.schedule.BreakTimeSchEntry'], 'location', lambda x: Conversion.locationName(x.getLocation()))
     @Retrieves (['MaKaC.schedule.BreakTimeSchEntry'], 'address', lambda x: Conversion.locationAddress(x.getLocation()))
+    @Retrieves (['MaKaC.schedule.BreakTimeSchEntry'], 'inheritLoc', lambda x: x.getOwnLocation() is None)
+    @Retrieves (['MaKaC.schedule.BreakTimeSchEntry'], 'inheritRoom', lambda x: x.getOwnRoom() is None)
 
     def __init__(self):

indico/htdocs/js/indico/Timetable/Management.js

@@ -221 +221 @@
         var href = Indico.Urls.Reschedule;
         var rescheduleLink = Html.a({style: {margin: '0 15px'}}, Html.span({style: {cursor: 'default', color: '#888'}}, 'Reschedule'));
+        
+        var underConstr = function(event) {
+            IndicoUI.Widgets.Generic.tooltip(this, event,"This option will be available soon");
+        };
+        rescheduleLink.dom.onmouseover = underConstr;
 
         this.menu = Html.div({style: {cssFloat: 'right', color: '#777'}}, addMenu, ' | ', rescheduleLink);
@@ -371 +376 @@
         
         args.set('startDate', IndicoUtil.formatDateTime(IndicoUtil.parseJsonDate(eventData.startDate)));
-        args.set('roomInfo',$O({"location": eventData.location,
-                                "room": eventData.room }));
+        args.set('roomInfo',$O({"location": eventData.inheritLoc?null:eventData.location,
+                                "room": eventData.inheritRoom?null:eventData.room,
+                                "address": eventData.inheritLoc?'':eventData.address}));
 
         var editDialog = new AddBreakDialog(this, args, $O(params.roomInfo), true);