Changeset eb09202 in indico

Timestamp:

01/28/10 17:46:06 (3 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

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, 4287315ec967a3da168d83963c14001db8487d53

Children:

f6f550

Parents:

019367

git-author:

Cesar Munoz Orena <cesar.munoz.orena@…> (01/26/10 10:40:09)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (01/28/10 17:46:06)

Message:

[FIXED] Default room inheriting always

• When adding or editing a session, a contribution or a break, even if the "inherit from parent" checkbox was not checked it kept inheriting the field.

-fixes #141

Location:

indico

Files:

• MaKaC/conference.py (modified) (5 diffs)
• MaKaC/schedule.py (modified) (3 diffs)
• MaKaC/services/implementation/schedule.py (modified) (3 diffs)
• MaKaC/webinterface/pages/contributions.py (modified) (2 diffs)
• MaKaC/webinterface/rh/contribMod.py (modified) (1 diff)
• MaKaC/webinterface/rh/sessionModif.py (modified) (1 diff)
• htdocs/js/indico/Management/RoomBooking.js (modified) (1 diff)
• htdocs/js/indico/Management/Timetable.js (modified) (2 diffs)
• htdocs/js/indico/Timetable/Management.js (modified) (1 diff)

indico/MaKaC/conference.py

@@ -5664 +5664 @@
         return color
 
-    def setValues( self, sessionData,check=2,moveEntries=0 ):
+    def setValues( self, sessionData,check=2,moveEntries=0, isEdit = False ):
         """Sets all the values of the current session object from a dictionary
             containing the following key-value pairs:
@@ -5715 +5715 @@
         #   to None so it will be considered to be the same as for the
         #   conference
-        if sessionData.get( "locationName", "" ).strip() == "":
+        #if we are creating the session we need to set the location as none, but if it's an edit
+        #it is neccesary to leave the location as "", because otherwise it will inherit it from the
+        #parent even if the checkbox is not checked
+        if sessionData.get( "locationName", "" ).strip() == "" and not isEdit:
             self.setLocation( None )
         else:
@@ -5727 +5730 @@
             loc.setAddress( sessionData.get("locationAddress", "") )
         #same as for the location
-        if sessionData.get( "roomName", "" ).strip() == "":
+        if sessionData.get( "roomName", "" ).strip() == "" and not isEdit:
                 self.setRoom( None )
         else:
@@ -8039 +8042 @@
         #   conference
         if data.has_key("locationName"):
-            if data["locationName"].strip()=="":
-                self.setLocation(None)
-            else:
+           # if data["locationName"].strip()=="":
+            #    self.setLocation(None)
+            #else:
                 #if the location name is defined we must set a new location (or
                 #   modify the existing one) for the contribution
@@ -8052 +8055 @@
         #same as for the location
         if data.has_key("roomName"):
-            if data["roomName"].strip()=="":
-                self.setRoom(None)
-            else:
+           # if data["roomName"].strip()=="":
+            #    self.setRoom(None)
+            #else:
                 room=self.getOwnRoom()
                 if not room:

indico/MaKaC/schedule.py

@@ -137 +137 @@
             1: check and raise error in case of problem
             2: check and adapt the owner dates"""
-
         if entry.isScheduled():
             # remove it from the old schedule and add it to this one
@@ -728 +727 @@
 
         owner = self.getOwner()
-
         if (entry is None) or self.hasEntry(entry):
             return
@@ -1171 +1169 @@
 
     def setValues( self, data, check=2, moveEntriesBelow=0, tz='UTC'):
-
         from MaKaC.conference import CustomLocation, CustomRoom
         # In order to move the entries below, it is needed to know the diff (we have to move them)

indico/MaKaC/services/implementation/schedule.py

@@ -56 +56 @@
 
         if location != None:
-            if location.strip()=="":
-                target.setLocation(None)
-            else:
+            #if location.strip()=="":
+            #    target.setLocation(None)
+            #else:
                 loc = target.getOwnLocation()
                 if not loc:
@@ -67 +67 @@
         #same as for the location
         if room != None:
-            if room.strip()=="":
-                target.setRoom(None)
-            else:
+            #if room.strip()=="":
+            #    target.setRoom(None)
+            #else:
                 r = target.getOwnRoom()
                 if not r:
@@ -380 +380 @@
 
         self._setLocationInfo(self._brk)
-
         self._addToSchedule(self._brk)
 

indico/MaKaC/webinterface/pages/contributions.py

@@ -1277 +1277 @@
             locationName = self._contrib.getLocation().getName()
             locationAddress = self._contrib.getLocation().getAddress()
+
         if self._contrib.getOwnRoom():
             defaultDefineRoom= "checked"
@@ -1338 +1339 @@
         minfo = info.HelperMaKaCInfo.getMaKaCInfoInstance()
         vars["useRoomBookingModule"] = minfo.getRoomBookingModuleActive()
-
         return vars
 

indico/MaKaC/webinterface/rh/contribMod.py

@@ -752 +752 @@
                 params["durMins"] = params["duration"];
             else:
-                params["durMins"] = ""
-            
+                params["durMins"] = ""        
             self._target.setValues(params)
             self._target.setType(self._type)

indico/MaKaC/webinterface/rh/sessionModif.py

@@ -254 +254 @@
                                     int( params["eMinute"] )))
         params["eDate"] = ed.astimezone(timezone('UTC'))
-        self._target.setValues(params,self._check,self._slmove)
+        self._target.setValues(params,self._check,self._slmove, True)
         self._target.setScheduleType(params.get("tt_type",self._target.getScheduleType()))
     

indico/htdocs/js/indico/Management/RoomBooking.js

@@ -159 +159 @@
                      self.roomChooser.enable();
                      self.addressArea.enable();
+
                      self._startBind();
+                     self.info.set('location', '');
+                     self.info.set('room', '');
+                     self.info.set('address', '');
                  }
              });

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

@@ -634 +634 @@
              var self = this;
 
-
              each(self.args, function(value, key) {
                  self.info.set(key, value);
@@ -799 +798 @@
                             this.timeField,
                             this.isEdit);
+             
+             invertableBind(this.info.accessor('inheritLoc'),
+                            this.roomEditor.inheritCheckbox.get(),
+                            false);
+             
+             invertableBind(this.info.accessor('inheritRoom'),
+                            this.roomEditor.inheritCheckbox.get(),
+                            false);             
 
              self.parameterManager.add(self.startTimeField, 'time', false);

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

@@ -396 +396 @@
 
         args.set('startDate', Util.formatDateTime(eventData.startDate, IndicoDateTimeFormats.Server));
-        args.set('roomInfo',$O({"location": eventData.inheritLoc?null:eventData.location,
+        args.set('roomInfo',$O({"location": eventData.inheritLoc?'':eventData.location,
                                 "room": eventData.inheritRoom?null:eventData.room,
                                 "address": eventData.inheritLoc?'':eventData.address}));