Changeset f6f550 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, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

ca129b

Parents:

eb09202

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (01/26/10 16:07:42)

git-committer:

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

Message:

[FIXED] Code review - Cesar's fixes

• Some issues with locations and rooms;
• None vs ;

Location:

indico

Files:

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

indico/MaKaC/conference.py

@@ -5664 +5664 @@
         return color
 
-    def setValues( self, sessionData,check=2,moveEntries=0, isEdit = False ):
+    def setValues( self, sessionData,check=2,moveEntries=0 ):
         """Sets all the values of the current session object from a dictionary
             containing the following key-value pairs:
@@ -5712 +5712 @@
                 self.setTextColor(self._getCorrectTextColor(textcolor))
         self.setTextColorToLinks(sessionData.has_key("textcolortolinks"))
-        #if the location is not defined we set the location of the session
-        #   to None so it will be considered to be the same as for the
-        #   conference
-        #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:
-            #if the location name is defined we must set a new location (or
-            #   modify the existing one) for the session
+
+        if "locationName" in sessionData:
             loc = self.getOwnLocation()
             if not loc:
@@ -5729 +5720 @@
             loc.setName( sessionData["locationName"] )
             loc.setAddress( sessionData.get("locationAddress", "") )
+
         #same as for the location
-        if sessionData.get( "roomName", "" ).strip() == "" and not isEdit:
-                self.setRoom( None )
-        else:
+        if "roomName" in sessionData:
             room = self.getOwnRoom()
             if not room:
@@ -5738 +5728 @@
             self.setRoom( room )
             room.setName( sessionData["roomName"] )
+
         if sessionData.get("sDate",None) is not None:
             self.setStartDate(sessionData["sDate"],check,moveEntries=moveEntries)
@@ -8038 +8029 @@
                 if data.has_key("f_%s"%id):
                     self.setField(id, data["f_%s"%id])
-        #if the location is not defined we set the location of the contribution
-        #   to None so it will be considered to be the same as for the
-        #   conference
-        if data.has_key("locationName"):
-           # 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
-                loc=self.getOwnLocation()
-                if not loc:
-                    loc=CustomLocation()
-                self.setLocation(loc)
-                loc.setName(data["locationName"])
-                loc.setAddress(data.get("locationAddress", ""))
+
+        if "locationName" in data:
+            loc=self.getOwnLocation()
+            if not loc:
+                loc=CustomLocation()
+            self.setLocation(loc)
+            loc.setName(data["locationName"])
+            loc.setAddress(data.get("locationAddress", ""))
+
         #same as for the location
-        if data.has_key("roomName"):
-           # if data["roomName"].strip()=="":
-            #    self.setRoom(None)
-            #else:
-                room=self.getOwnRoom()
-                if not room:
-                    room=CustomRoom()
-                self.setRoom(room)
-                room.setName(data["roomName"])
+        if "roomName" in data:
+            room=self.getOwnRoom()
+            if not room:
+                room=CustomRoom()
+            self.setRoom(room)
+            room.setName(data["roomName"])
         tz = 'UTC'
         if self.getConference():

indico/MaKaC/services/implementation/schedule.py

@@ -56 +56 @@
 
         if location != None:
-            #if location.strip()=="":
-            #    target.setLocation(None)
-            #else:
-                loc = target.getOwnLocation()
-                if not loc:
-                    loc = conference.CustomLocation()
-                target.setLocation(loc)
-                loc.setName(location)
-                loc.setAddress(address)
+            loc = target.getOwnLocation()
+            if not loc:
+                loc = conference.CustomLocation()
+            target.setLocation(loc)
+            loc.setName(location)
+            loc.setAddress(address)
+
         #same as for the location
         if room != None:
-            #if room.strip()=="":
-            #    target.setRoom(None)
-            #else:
-                r = target.getOwnRoom()
-                if not r:
-                    r = conference.CustomRoom()
-                target.setRoom(r)
-                r.setName(room)
+            r = target.getOwnRoom()
+            if not r:
+                r = conference.CustomRoom()
+            target.setRoom(r)
+            r.setName(room)
 
 class ScheduleOperation:

indico/MaKaC/webinterface/rh/contribMod.py

@@ -748 +748 @@
                 params["sHour"] = ""
                 params["sMinute"] = ""
-            
+
             if params.has_key("duration"):
                 params["durMins"] = params["duration"];
             else:
-                params["durMins"] = ""        
+                params["durMins"] = ""
             self._target.setValues(params)
             self._target.setType(self._type)

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

@@ -161 +161 @@
 
                      self._startBind();
-                     self.info.set('location', '');
-                     self.info.set('room', '');
-                     self.info.set('address', '');
                  }
              });

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

@@ -3 +3 @@
 
     return (!info) ||
-        (!info.get('location')) ||
-        (!info.get('room'));
+        (!exists(info.get('location'))) ||
+        (!exists(info.get('room')));
 }
 
@@ -798 +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);             
+                            false);
 
              self.parameterManager.add(self.startTimeField, 'time', false);