Changeset af4162 in indico

Timestamp:

02/23/10 08:47:26 (3 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, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

019031, f3d0f4

Parents:

9278fc

Message:

[FIX] Missing locationAddress value

set to empty string by default

File:

• indico/MaKaC/webinterface/rh/categoryDisplay.py (modified) (20 diffs)

indico/MaKaC/webinterface/rh/categoryDisplay.py

@@ -67 +67 @@
 class RHCategoryDisplay( RHCategDisplayBase ):
     _uh = urlHandlers.UHCategoryDisplay
-    
+
     def _process( self ):
-        
+
         wfReg = webFactoryRegistry.WebFactoryRegistry()
         p = category.WPCategoryDisplay( self, self._target, wfReg )
@@ -77 +77 @@
 class RHCategoryMap( RHCategDisplayBase ):
     _uh = urlHandlers.UHCategoryMap
-    
+
     def _process( self ):
         p = category.WPCategoryMap( self, self._target )
@@ -84 +84 @@
 class RHCategoryStatistics( RHCategDisplayBase ):
     _uh = urlHandlers.UHCategoryStatistics
-    
+
     def _process( self ):
         wfReg = webFactoryRegistry.WebFactoryRegistry()
@@ -92 +92 @@
 
 class RHCategOverviewDisplay( RHCategDisplayBase ):
-    
+
     def _checkParams( self, params ):
         id = params.get("selCateg", "")
@@ -115 +115 @@
             self._cal = wcalendar.Overview( self._aw, sd, [self._target] )
         self._cal.setDetailLevel( params.get("detail", "conference") )
-    
+
     def _process( self ):
         p = category.WPCategOverview( self, self._target, self._cal )
@@ -121 +121 @@
 
 class RHConferenceCreationBase( RHCategoryDisplay ):
-    
-    def _checkProtection( self ): 
+
+    def _checkProtection( self ):
         self._checkSessionUser()
         RHCategoryDisplay._checkProtection( self )
@@ -129 +129 @@
         if not self._target.canCreateConference( self._getUser() ):
             raise MaKaCError( _("You are not allowed to create conferences inside this category"))
-    
+
     def _checkParams( self, params, mustExist=1 ):
         RHCategoryDisplay._checkParams( self, params, mustExist )
@@ -139 +139 @@
         if et != "" and et !="default":
             self._wf = self._wfReg.getFactoryById( et )
-        
+
 
 #-------------------------------------------------------------------------------------
@@ -192 +192 @@
         return
 
-    def _process( self ):   
+    def _process( self ):
         params = self._getRequestParams()
         if params["title"]=="":
@@ -231 +231 @@
                 c = lectures[0]
             self._redirect(urlHandlers.UHConferenceModification.getURL( c ) )
-        else :     
+        else :
             url = urlHandlers.UHCategoryDisplay.getURL(self._target)
             self._redirect(url)
@@ -248 +248 @@
                 c.disableSessionSlots()
         return c
-            
+
     def _getPersons(self):
         avatars, newUsers = [], []
@@ -309 +309 @@
 %s """ % (i,c.getStartDate(), c.getEndDate(), i,urlHandlers.UHConferenceDisplay.getURL(c))
                 i+=1
-        
+
         msg = ("Content-Type: text/plain; charset=\"utf-8\"\r\nFrom: %s\r\nReturn-Path: %s\r\nTo: %s\r\nCc: \r\nSubject: %s\r\n\r\n"%(fromAddr, fromAddr, addrs, subject))
         msg = msg + text
-        maildata = { "fromAddr": fromAddr, "toList": addrs, "subject": subject, "body": text }        
+        maildata = { "fromAddr": fromAddr, "toList": addrs, "subject": subject, "body": text }
         self._emailsToBeSent.append(maildata)
         # Category notification
@@ -319 +319 @@
             maildata2 = { "fromAddr": fromAddr, "toList": addrs2, "subject": subject, "body": text }
             self._emailsToBeSent.append(maildata2)
-        
-        
+
+
 class UtilPersons:
-        
+
     @staticmethod
-    def addToConf( avatars, newUsers, conf, grantManager): 
-        
+    def addToConf( avatars, newUsers, conf, grantManager):
+
         if newUsers :
             for newUser in newUsers:
@@ -343 +343 @@
                     #self._errorList.append("%s has been already defined as %s of this conference"%(person.getFullName(),self._typeName))
                     pass
-        
+
         if avatars:
 
             for selected in avatars :
-                if isinstance(selected, user.Avatar) :                    
+                if isinstance(selected, user.Avatar) :
                     person = ConferenceChair()
                     person.setDataFromAvatar(selected)
@@ -353 +353 @@
                         #TODO: add to conf
                         UtilPersons._add(conf, person, grantManager)
-                    else :                        
+                    else :
                         #self._errorList.append("%s has been already defined as %s of this conference"%(person.getFullName(),self._typeName))
                         pass
-                        
-                #elif isinstance(selected, user.Group) : 
+
+                #elif isinstance(selected, user.Group) :
                 #    for member in selected.getMemberList() :
                 #        person = ConferenceChair()
                 #        person.setDataFromAvatar(member)
                 #        if not self._alreadyDefined(person, definedList) :
-                #            definedList.append([person,params.has_key("submissionControl")])            
+                #            definedList.append([person,params.has_key("submissionControl")])
                 #        else :
                 #            self._errorList.append("%s has been already defined as %s of this conference"%(presenter.getFullName(),self._typeName))
-        
+
     @staticmethod
     def _alreadyDefined(person):#, definedList):
@@ -442 +442 @@
                 c.setLocation( l )
             l.setName( confData["locationName"] )
-            l.setAddress( confData["locationAddress"] )
+            l.setAddress( confData.get("locationAddress","") )
 
         roomName = confData.get( "locationBookedRoom" )  or  confData.get( "roomName" )  or  ""
@@ -472 +472 @@
 
 class RHCategoryGetIcon(RHCategDisplayBase):
-    
+
     def _process(self):
         icon=self._target.getIcon()
@@ -501 +501 @@
 
 class RHCategoryToiCal(RHCategoryOpenService):
-    
+
     def _processData( self ):
         filename = "%s - Event.ics"%self._target.getName().replace("/","")
@@ -518 +518 @@
     def _getRSS( self, tz ):
         return CategoryToRSS(self._target,tz=tz).getBody()
-    
+
     def _processData( self ):
         data = ""
@@ -529 +529 @@
 
 class RHTodayCategoryToRSS(RHCategoryToRSS):
-    
+
     def _getRSS( self, tz ):
         return CategoryToRSS(self._target, date=nowutc().astimezone(timezone(tz)), tz=tz).getBody()
-    
+
 
 def sortByStartDate(conf1,conf2):
-    return cmp(conf1.getStartDate(),conf2.getStartDate()) 
-
+    return cmp(conf1.getStartDate(),conf2.getStartDate())
+