Changeset 922d14 in indico


Ignore:
Timestamp:
08/13/10 14:56:57 (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, 0da0c1403bae8e51d8229f460181c71b9e6dda72
Children:
2050db
Parents:
84d986 (diff), 4dd389 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'fix#308-registrant-list-opt' into v0.97-series

Location:
indico/MaKaC
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • indico/MaKaC/PDFinterface/base.py

    rde2a21 r84d986  
    409409    def _drawLogo(self, c, drawTitle = True): 
    410410        if HAVE_PIL: 
     411            clean = False 
    411412            logo = self._conf.getLogo() 
    412413            imagePath = "" 

  • indico/MaKaC/common/filters.py

    rbdd862 r4dd389  
    258258        result = [] 
    259259        if self._filter: 
    260             #self._filter.optimise() 
    261             for item in targetList: 
    262                 if self._filter.satisfies( item ): 
    263                     result.append( item ) 
     260            result = [item for item in targetList if self._filter.satisfies( item )] 
    264261        else: 
    265262            result = targetList 

  • indico/MaKaC/common/url.py

    rbdd862 r4dd389  
    2828 
    2929class URL: 
    30     """This class represents an internet URL and provides methods in order to  
     30    """This class represents an internet URL and provides methods in order to 
    3131        handle it in an easy way; it encapsulates the encoding of the parameters 
    32         so clients don't need to worry about that. It also implements the  
     32        so clients don't need to worry about that. It also implements the 
    3333        __str__ method which will allow to treat it as a simple string. 
    34         
     34 
    3535       Attributes: 
    36         _base - (String) base url containing the protocol, hostname and path  
     36        _base - (String) base url containing the protocol, hostname and path 
    3737            in a correct way 
    3838        _params - (Dict) parameters to be added to the URL 
    3939    """ 
    40      
     40 
    4141    def __init__( self, base, **params ): 
    4242        self._segment = "" 
    4343        self.setBase( base ) 
    4444        self.setParams( params ) 
    45         """  
    46             Spearator might need to be set to &amp; by default inorder to  
     45        """ 
     46            Spearator might need to be set to &amp; by default inorder to 
    4747            follow the W3C standard, but this seems to give problems in IE. 
    4848        """ 
    … …  
    6060    def setSegment( self, newSegment ): 
    6161        self._segment = newSegment.strip() 
    62          
     62 
    6363    def getSeparator(self): 
    6464        if not hasattr(self, "_separator"): 
    6565            self._separator = "&" 
    6666        return self._separator 
    67      
     67 
    6868    def setSeparator(self, separator): 
    6969        self._separator = separator 
    … …  
    8686            del self._params[name.strip()] 
    8787 
    88     def _encodeParamValue( self, value ):  
     88    def _encodeParamValue( self, value ): 
    8989        return urllib.quote_plus( str( value ).strip() ) 
    9090 
    … …  
    9595            if type(value) == list or isinstance(value, UserList): 
    9696                for v in value: 
    97                     l.append("%s=%s"%(name, self._encodeParamValue( v ))) 
     97                    l.append(name + '=' + self._encodeParamValue( v )) 
    9898            else: 
    99                 l.append("%s=%s"%(name, self._encodeParamValue( value ))) 
     99                l.append(name + '=' + self._encodeParamValue( value )) 
    100100        return self._separator.join( l ) 
    101101 
    102102    def __str__( self ): 
    103103        params = self._getParamsURLForm() 
    104         if params.strip() != "": 
    105             params = "?%s"%self._getParamsURLForm() 
     104        if params.strip(): 
     105            params = "?" + params 
    106106        segment = self.getSegment() 
    107         if segment != "": 
    108             segment = "#%s"%segment 
    109         return "%s%s%s"%( self.getBase(), params, segment ) 
     107        if segment: 
     108            segment = "#" + segment 
     109        return self.getBase() + params + segment 
    110110 
    111111 
    112112class MailtoURL: 
    113      
     113 
    114114    def __init__( self, dest, **params ): 
    115115        self._destination = dest 
    … …  
    134134        return res 
    135135 
    136              
     136 
    137137 
    138138class ShortURLMapper(ObjectHolder): 
    139      
     139 
    140140    idxName = "shorturl" 
    141      
     141 
    142142    def add( self, tag, newItem ): 
    143143        if not tag: 
    … …  
    148148        tree[tag] = newItem 
    149149        return tag 
    150      
     150 
    151151    def remove( self, item ): 
    152152        """removes the specified object from the index. 
    … …  
    156156            return 
    157157        del tree[item.getUrlTag()] 
    158      
    159          
    160      
     158 
     159 

  • indico/MaKaC/registration.py

    r8df9bb r4dd389  
    3838from MaKaC.webinterface.mail import GenericMailer, GenericNotification 
    3939from MaKaC.i18n import _ 
     40from MaKaC.webinterface.common.countries import CountryHolder 
     41import re 
    4042 
    4143import string 
    … …  
    26152617        return lv 
    26162618 
     2619    def getSessions(self): 
     2620        return self._sessions 
     2621 
    26172622    def addSession(self, ses): 
    26182623        if not self._sessions.has_key(ses.getId()): 
    … …  
    38313836    def setStatusValue(self, v): 
    38323837        self._value=v 
     3838 
     3839class RegistrantMapping(object): 
     3840 
     3841    def __init__(self, registrant): 
     3842        self._registrant = registrant 
     3843        self._regDict = { 
     3844                        "FirstName" :           self._registrant.getFirstName, 
     3845                        "LastName" :            self._registrant.getSurName, 
     3846                        "Institution" :         self._registrant.getInstitution, 
     3847                        "Position" :            self._registrant.getPosition, 
     3848                        "Phone" :               self._registrant.getPhone, 
     3849                        "City" :                self._registrant.getCity, 
     3850                        "Address" :             self._registrant.getAddress, 
     3851                        "Email" :               self._registrant.getEmail, 
     3852                        "isPayed" :             self._registrant.isPayedText, 
     3853                        "idpayment" :           self._registrant.getIdPay, 
     3854                        "Country" :             self._getCountry, 
     3855                        "amountToPay" :         self._getAmountToPay, 
     3856                        "Accomodation" :        self._getAccomodation, 
     3857                        "SocialEvents" :        self._getSocialEvents, 
     3858                        "ReasonParticipation" : self._getReasonParticipation, 
     3859                        "RegistrationDate" :    self._getRegistrationDate, 
     3860                        "Sessions" :            self._getSessions, 
     3861                        "DepartureDate" :       self._getDepartureDate, 
     3862                        "ArrivalDate" :         self._getArrivalDate 
     3863                        } 
     3864 
     3865    def __getitem__(self, key): 
     3866        if self._regDict.has_key(key): 
     3867            return self._regDict[key]() 
     3868        elif re.match("s-[0-9]+$", key): 
     3869            return self._getStatus(key[2:]) 
     3870        elif re.match("[0-9]+$", key): 
     3871            return self._getGroup(key) 
     3872        elif re.match("[0-9]+-[0-9]+$", key): 
     3873            dashPos = key.find('-') 
     3874            return self._getItem(key[:dashPos], key[dashPos + 1:]) 
     3875        else: 
     3876            return "&nbsp;" 
     3877 
     3878    def _getCountry(self): 
     3879        return CountryHolder().getCountryById(self._registrant.getCountry()) 
     3880 
     3881    def _getAmountToPay(self): 
     3882        return "%.2f %s"%(self._registrant.getTotal(), self._registrant.getConference().getRegistrationForm().getCurrency()) 
     3883 
     3884    def _getAccomodation(self): 
     3885        if self._registrant.getAccommodation() is not None: 
     3886            if self._registrant.getAccommodation().getAccommodationType() is not None: 
     3887                return self._registrant.getAccommodation().getAccommodationType().getCaption() 
     3888        return "" 
     3889 
     3890    def _getDepartureDate(self): 
     3891        if self._registrant.getAccommodation() is not None: 
     3892            if self._registrant.getAccommodation().getDepartureDate() is not None: 
     3893                return self._registrant.getAccommodation().getDepartureDate().strftime("%d-%B-%Y") 
     3894        return "" 
     3895 
     3896    def _getArrivalDate(self): 
     3897        if self._registrant.getAccommodation() is not None: 
     3898            if self._registrant.getAccommodation().getArrivalDate() is not None: 
     3899                return self._registrant.getAccommodation().getArrivalDate().strftime("%d-%B-%Y") 
     3900        return "" 
     3901 
     3902    def _getSocialEvents(self): 
     3903        events = self._registrant.getSocialEvents() 
     3904        items = ["%s (%s)"%(item.getCaption(), item.getNoPlaces()) for item in events ] 
     3905        return "<br>".join(items) 
     3906 
     3907    def _getReasonParticipation(self): 
     3908        return self._registrant.getReasonParticipation() or "" 
     3909 
     3910    def _getRegistrationDate(self): 
     3911 
     3912        if self._registrant.getRegistrationDate() is not None: 
     3913            return self._registrant.getAdjustedRegistrationDate().strftime("%d-%B-%Y %H:%M") 
     3914        else: 
     3915            return _("""--  _("date unknown")--""") 
     3916 
     3917    def _getSessions(self): 
     3918        sessions = self._registrant.getSessionList() 
     3919        return "<br>".join([sess.getTitle() for sess in sessions]) 
     3920 
     3921    def _getStatus(self, id): 
     3922        st = self._registrant.getStatusById(id) 
     3923        if st.getStatusValue() is not None: 
     3924            return st.getStatusValue().getCaption() 
     3925        else: 
     3926            return  _("""<span style="white-space:nowrap">--  _("not set") --</span>""") 
     3927 
     3928    def _getGroup(self, groupId): 
     3929        if self._registrant.getMiscellaneousGroupById(groupId): 
     3930            return self._registrant.getMiscellaneousGroupById(groupId).getTitle() 
     3931        else: 
     3932            return "" 
     3933 
     3934    def _getItem(self, groupId, itemId): 
     3935        if self._registrant.getMiscellaneousGroupById(groupId) and \ 
     3936           self._registrant.getMiscellaneousGroupById(groupId).getResponseItemById(itemId): 
     3937            return self._registrant.getMiscellaneousGroupById(groupId).getResponseItemById(itemId).getValue() 
     3938        else: 
     3939            return "" 

  • indico/MaKaC/webinterface/common/countries.py

    rbdd862 r4dd389  
    2323class CountryHolder: 
    2424 
    25     def __init__(self): 
    26         self._countries = {} 
    27         self._countries['AF'] = "AFGHANISTAN" 
    28         self._countries['AL'] = "ALBANIA" 
    29         self._countries['DZ'] = "ALGERIA" 
    30         self._countries['AS'] = "AMERICAN SAMOA" 
    31         self._countries['AD'] = "ANDORRA" 
    32         self._countries['AO'] = "ANGOLA" 
    33         self._countries['AG'] = "ANTIGUA" 
    34         self._countries['AR'] = "ARGENTINA" 
    35         self._countries['AM'] = "ARMENIA" 
    36         self._countries['AW'] = "ARUBA" 
    37         self._countries['AU'] = "AUSTRALIA" 
    38         self._countries['AT'] = "AUSTRIA" 
    39         self._countries['AZ'] = "AZERBAIJAN" 
    40         self._countries['BS'] = "BAHAMAS" 
    41         self._countries['BH'] = "BAHRAIN" 
    42         self._countries['BD'] = "BANGLADESH" 
    43         self._countries['BB'] = "BARBADOS" 
    44         self._countries['BY'] = "BELARUS" 
    45         self._countries['BE'] = "BELGIUM" 
    46         self._countries['BZ'] = "BELIZE" 
    47         self._countries['BJ'] = "BENIN" 
    48         self._countries['BM'] = "BERMUDA" 
    49         self._countries['BT'] = "BHUTAN" 
    50         self._countries['BO'] = "BOLIVIA" 
    51         self._countries['BA'] = "BOSNIA" 
    52         self._countries['BW'] = "BOTSWANA" 
    53         self._countries['BR'] = "BRAZIL" 
    54         self._countries['VG'] = "BRITISH VIRGIN ISLANDS" 
    55         self._countries['BN'] = "BRUNEI" 
    56         self._countries['BG'] = "BULGARIA" 
    57         self._countries['BF'] = "BURKINA FASO" 
    58         self._countries['BI'] = "BURUNDI" 
    59         self._countries['CA'] = "CANADA" 
    60         self._countries['CV'] = "CAPE VERDE" 
    61         self._countries['KY'] = "CAYMAN Islands" 
    62         self._countries['CF'] = "CENTRAL AFRICAN REPUBLIC" 
    63         self._countries['TD'] = "CHAD" 
    64         self._countries['CL'] = "CHILE" 
    65         self._countries['CN'] = "CHINA" 
    66         self._countries['CC'] = "COCOS Islands" 
    67         self._countries['CO'] = "COLOMBIA" 
    68         self._countries['KM'] = "COMOROS" 
    69         self._countries['CG'] = "CONGO" 
    70         self._countries['CR'] = "COSTA RICA" 
    71         self._countries['HR'] = "CROATIA" 
    72         self._countries['CU'] = "CUBA" 
    73         self._countries['CY'] = "CYPRUS" 
    74         self._countries['CZ'] = "CZECH REPUBLIC" 
    75         self._countries['KP'] = "DEM. PEO. REP. OF KOREA" 
    76         self._countries['KH'] = "DEMOCRATIC KAMPUCHEA" 
    77         self._countries['CD'] = "DEMOCRATIC REPUBLIC OF CONGO" 
    78         self._countries['DK'] = "DENMARK" 
    79         self._countries['DJ'] = "DJIBOUTI" 
    80         self._countries['DM'] = "DOMINICA" 
    81         self._countries['DO'] = "DOMINICAN REPUBLIC" 
    82         self._countries['EC'] = "ECUADOR" 
    83         self._countries['EG'] = "EGYPT" 
    84         self._countries['SV'] = "EL SALVADOR" 
    85         self._countries['GQ'] = "EQUATORIAL GUINEA" 
    86         self._countries['ER'] = "ERITREA" 
    87         self._countries['EE'] = "ESTONIA" 
    88         self._countries['ET'] = "ETHIOPIA" 
    89         self._countries['FJ'] = "FIJI" 
    90         self._countries['FI'] = "FINLAND" 
    91         self._countries['FR'] = "FRANCE" 
    92         self._countries['GF'] = "FRENCH GUIANA" 
    93         self._countries['PF'] = "FRENCH POLYNESIA" 
    94         self._countries['GA'] = "GABON" 
    95         self._countries['GM'] = "GAMBIA" 
    96         self._countries['GE'] = "GEORGIA" 
    97         self._countries['DE'] = "GERMANY" 
    98         self._countries['GH'] = "GHANA" 
    99         self._countries['GI'] = "GIBRALTAR" 
    100         self._countries['GR'] = "GREECE" 
    101         self._countries['GL'] = "GREENLAND" 
    102         self._countries['GD'] = "GRENADA" 
    103         self._countries['GP'] = "GUADELOUPE" 
    104         self._countries['GU'] = "GUAM" 
    105         self._countries['GT'] = "GUATEMALA" 
    106         self._countries['GN'] = "GUINEA" 
    107         self._countries['GW'] = "GUINEA-BISSAU" 
    108         self._countries['GY'] = "GUYANA" 
    109         self._countries['HT'] = "HAITI" 
    110         self._countries['HN'] = "HONDURAS" 
    111         self._countries['HK'] = "HONG-KONG" 
    112         self._countries['HU'] = "HUNGARY" 
    113         self._countries['IS'] = "ICELAND" 
    114         self._countries['IN'] = "INDIA" 
    115         self._countries['ID'] = "INDONESIA" 
    116         self._countries['IR'] = "IRAN" 
    117         self._countries['IQ'] = "IRAQ" 
    118         self._countries['IE'] = "IRELAND" 
    119         self._countries['IL'] = "ISRAEL" 
    120         self._countries['IT'] = "ITALY" 
    121         self._countries['CI'] = "IVORY COAST" 
    122         self._countries['JM'] = "JAMAICA" 
    123         self._countries['JP'] = "JAPAN" 
    124         self._countries['JO'] = "JORDAN" 
    125         self._countries['KZ'] = "KAZAKHSTAN" 
    126         self._countries['KE'] = "KENYA" 
    127         self._countries['KW'] = "KUWAIT" 
    128         self._countries['KG'] = "KYRGYZSTAN" 
    129         self._countries['LA'] = "LAO PEOPLE'S DEM. REP." 
    130         self._countries['LV'] = "LATVIA" 
    131         self._countries['LB'] = "LEBANON" 
    132         self._countries['LS'] = "LESOTHO" 
    133         self._countries['LR'] = "LIBERIA" 
    134         self._countries['LY'] = "LIBYAN ARAB JAMAHIRYA" 
    135         self._countries['LI'] = "LIECHTENSTEIN" 
    136         self._countries['LT'] = "LITHUANIA" 
    137         self._countries['LU'] = "LUXEMBURG" 
    138         self._countries['MO'] = "MACAU" 
    139         self._countries['MK'] = "MACEDONIA, F.Y.R." 
    140         self._countries['MG'] = "MADAGASCAR" 
    141         self._countries['MW'] = "MALAWI" 
    142         self._countries['MY'] = "MALAYSIA" 
    143         self._countries['MV'] = "MALDIVES" 
    144         self._countries['ML'] = "MALI" 
    145         self._countries['MT'] = "MALTA" 
    146         self._countries['MQ'] = "MARTINIQUE" 
    147         self._countries['MR'] = "MAURITANIA" 
    148         self._countries['MU'] = "MAURITIUS" 
    149         self._countries['MX'] = "MEXICO" 
    150         self._countries['MD'] = "MOLDOVA" 
    151         self._countries['MC'] = "MONACO" 
    152         self._countries['MN'] = "MONGOLIA" 
    153         self._countries['ME'] = "MONTENEGRO" 
    154         self._countries['MA'] = "MOROCCO" 
    155         self._countries['MZ'] = "MOZAMBIQUE" 
    156         self._countries['XX'] = "MULTIPLE COUNTRIES" 
    157         self._countries['MM'] = "MYANAMAR" 
    158         self._countries['NA'] = "NAMIBIA" 
    159         self._countries['NP'] = "NEPAL" 
    160         self._countries['AN'] = "NETHERLANDS ANTILLES" 
    161         self._countries['NL'] = "NETHERLANDS" 
    162         self._countries['NC'] = "NEW CALEDONIA" 
    163         self._countries['NZ'] = "NEW ZEALAND" 
    164         self._countries['NI'] = "NICARAGUA" 
    165         self._countries['NE'] = "NIGER" 
    166         self._countries['NG'] = "NIGERIA" 
    167         self._countries['NO'] = "NORWAY" 
    168         self._countries['OM'] = "OMAN" 
    169         self._countries['PK'] = "PAKISTAN" 
    170         self._countries['PA'] = "PANAMA" 
    171         self._countries['PG'] = "PAPUA NEW GUINEA" 
    172         self._countries['PY'] = "PARAGUAY" 
    173         self._countries['PE'] = "PERU" 
    174         self._countries['PH'] = "PHILIPPINES" 
    175         self._countries['PL'] = "POLAND" 
    176         self._countries['PT'] = "PORTUGAL" 
    177         self._countries['PR'] = "PUERTO RICO" 
    178         self._countries['QA'] = "QATAR" 
    179         self._countries['KR'] = "REPUBLIC OF KOREA" 
    180         self._countries['RE'] = "REUNION" 
    181         self._countries['RO'] = "ROMANIA" 
    182         self._countries['RU'] = "RUSSIA" 
    183         self._countries['RW'] = "RWANDA" 
    184         self._countries['LC'] = "SAINT LUCIA" 
    185         self._countries['SM'] = "SAN MARINO" 
    186         self._countries['ST'] = "SAO TOME - PRINCIPE" 
    187         self._countries['SA'] = "SAUDI ARABIA" 
    188         self._countries['SN'] = "SENEGAL" 
    189         self._countries['RS'] = "SERBIA" 
    190         self._countries['SC'] = "SEYCHELLES" 
    191         self._countries['SL'] = "SIERRA LEONE" 
    192         self._countries['SG'] = "SINGAPORE" 
    193         self._countries['SK'] = "SLOVAKIA" 
    194         self._countries['SI'] = "SLOVENIA" 
    195         self._countries['SO'] = "SOMALIA" 
    196         self._countries['ZA'] = "SOUTH AFRICA" 
    197         self._countries['ES'] = "SPAIN" 
    198         self._countries['LK'] = "SRI LANKA" 
    199         self._countries['SD'] = "SUDAN" 
    200         self._countries['SR'] = "SURINAM" 
    201         self._countries['SE'] = "SWEDEN" 
    202         self._countries['CH'] = "SWITZERLAND" 
    203         self._countries['SY'] = "SYRIEN ARAB REPUBLIC" 
    204         self._countries['TW'] = "TAIWAN, PROVINCE OF CHINA" 
    205         self._countries['TJ'] = "TAJIKISTAN" 
    206         self._countries['TH'] = "THAILAND" 
    207         self._countries['TG'] = "TOGO" 
    208         self._countries['TO'] = "TONGA" 
    209         self._countries['TT'] = "TRINIDAD TOBAGO" 
    210         self._countries['TN'] = "TUNISIA" 
    211         self._countries['TR'] = "TURKEY" 
    212         self._countries['TM'] = "TURKMENISTAN" 
    213         self._countries['UG'] = "UGANDA" 
    214         self._countries['UA'] = "UKRAINE" 
    215         self._countries['TZ'] = "UN. REP. OF TANZANIA" 
    216         self._countries['CM'] = "UN.-REP. OF CAMEROON" 
    217         self._countries['AE'] = "UNITED ARAB EMIRATES" 
    218         self._countries['GB'] = "UNITED KINGDOM" 
    219         self._countries['US'] = "UNITED STATES OF AMERICA" 
    220         self._countries['UY'] = "URUGUAY" 
    221         self._countries['SU'] = "USSR" 
    222         self._countries['UZ'] = "UZBEKISTAN" 
    223         self._countries['VA'] = "VATICAN CITY STATE" 
    224         self._countries['VE'] = "VENEZUELA" 
    225         self._countries['VN'] = "VIETNAM" 
    226         self._countries['EH'] = "WESTERN SAHARA" 
    227         self._countries['YD'] = "YEMEN DEMOCRATIC" 
    228         self._countries['YE'] = "YEMEN" 
    229         self._countries['ZM'] = "ZAMBIA" 
    230         self._countries['ZW'] = "ZIMBABWE" 
    231  
    232     def getCountries(self): 
    233         return self._countries 
    234  
    235     def getCountryList( self ): 
    236         return self._countries.values() 
    237  
    238     def getCountryById( self, id ): 
    239         return self._countries.get(id, "") 
    240  
    241     def getCountryKeys(self): 
    242         return self._countries.keys() 
    243  
    244     def getCountrySortedKeys(self): 
    245         keys = self.getCountryKeys() 
    246         keys.sort(self._sortByValue) 
     25    _countries = {} 
     26    _countries['AF'] = "AFGHANISTAN" 
     27    _countries['AL'] = "ALBANIA" 
     28    _countries['DZ'] = "ALGERIA" 
     29    _countries['AS'] = "AMERICAN SAMOA" 
     30    _countries['AD'] = "ANDORRA" 
     31    _countries['AO'] = "ANGOLA" 
     32    _countries['AG'] = "ANTIGUA" 
     33    _countries['AR'] = "ARGENTINA" 
     34    _countries['AM'] = "ARMENIA" 
     35    _countries['AW'] = "ARUBA" 
     36    _countries['AU'] = "AUSTRALIA" 
     37    _countries['AT'] = "AUSTRIA" 
     38    _countries['AZ'] = "AZERBAIJAN" 
     39    _countries['BS'] = "BAHAMAS" 
     40    _countries['BH'] = "BAHRAIN" 
     41    _countries['BD'] = "BANGLADESH" 
     42    _countries['BB'] = "BARBADOS" 
     43    _countries['BY'] = "BELARUS" 
     44    _countries['BE'] = "BELGIUM" 
     45    _countries['BZ'] = "BELIZE" 
     46    _countries['BJ'] = "BENIN" 
     47    _countries['BM'] = "BERMUDA" 
     48    _countries['BT'] = "BHUTAN" 
     49    _countries['BO'] = "BOLIVIA" 
     50    _countries['BA'] = "BOSNIA" 
     51    _countries['BW'] = "BOTSWANA" 
     52    _countries['BR'] = "BRAZIL" 
     53    _countries['VG'] = "BRITISH VIRGIN ISLANDS" 
     54    _countries['BN'] = "BRUNEI" 
     55    _countries['BG'] = "BULGARIA" 
     56    _countries['BF'] = "BURKINA FASO" 
     57    _countries['BI'] = "BURUNDI" 
     58    _countries['CA'] = "CANADA" 
     59    _countries['CV'] = "CAPE VERDE" 
     60    _countries['KY'] = "CAYMAN Islands" 
     61    _countries['CF'] = "CENTRAL AFRICAN REPUBLIC" 
     62    _countries['TD'] = "CHAD" 
     63    _countries['CL'] = "CHILE" 
     64    _countries['CN'] = "CHINA" 
     65    _countries['CC'] = "COCOS Islands" 
     66    _countries['CO'] = "COLOMBIA" 
     67    _countries['KM'] = "COMOROS" 
     68    _countries['CG'] = "CONGO" 
     69    _countries['CR'] = "COSTA RICA" 
     70    _countries['HR'] = "CROATIA" 
     71    _countries['CU'] = "CUBA" 
     72    _countries['CY'] = "CYPRUS" 
     73    _countries['CZ'] = "CZECH REPUBLIC" 
     74    _countries['KP'] = "DEM. PEO. REP. OF KOREA" 
     75    _countries['KH'] = "DEMOCRATIC KAMPUCHEA" 
     76    _countries['CD'] = "DEMOCRATIC REPUBLIC OF CONGO" 
     77    _countries['DK'] = "DENMARK" 
     78    _countries['DJ'] = "DJIBOUTI" 
     79    _countries['DM'] = "DOMINICA" 
     80    _countries['DO'] = "DOMINICAN REPUBLIC" 
     81    _countries['EC'] = "ECUADOR" 
     82    _countries['EG'] = "EGYPT" 
     83    _countries['SV'] = "EL SALVADOR" 
     84    _countries['GQ'] = "EQUATORIAL GUINEA" 
     85    _countries['ER'] = "ERITREA" 
     86    _countries['EE'] = "ESTONIA" 
     87    _countries['ET'] = "ETHIOPIA" 
     88    _countries['FJ'] = "FIJI" 
     89    _countries['FI'] = "FINLAND" 
     90    _countries['FR'] = "FRANCE" 
     91    _countries['GF'] = "FRENCH GUIANA" 
     92    _countries['PF'] = "FRENCH POLYNESIA" 
     93    _countries['GA'] = "GABON" 
     94    _countries['GM'] = "GAMBIA" 
     95    _countries['GE'] = "GEORGIA" 
     96    _countries['DE'] = "GERMANY" 
     97    _countries['GH'] = "GHANA" 
     98    _countries['GI'] = "GIBRALTAR" 
     99    _countries['GR'] = "GREECE" 
     100    _countries['GL'] = "GREENLAND" 
     101    _countries['GD'] = "GRENADA" 
     102    _countries['GP'] = "GUADELOUPE" 
     103    _countries['GU'] = "GUAM" 
     104    _countries['GT'] = "GUATEMALA" 
     105    _countries['GN'] = "GUINEA" 
     106    _countries['GW'] = "GUINEA-BISSAU" 
     107    _countries['GY'] = "GUYANA" 
     108    _countries['HT'] = "HAITI" 
     109    _countries['HN'] = "HONDURAS" 
     110    _countries['HK'] = "HONG-KONG" 
     111    _countries['HU'] = "HUNGARY" 
     112    _countries['IS'] = "ICELAND" 
     113    _countries['IN'] = "INDIA" 
     114    _countries['ID'] = "INDONESIA" 
     115    _countries['IR'] = "IRAN" 
     116    _countries['IQ'] = "IRAQ" 
     117    _countries['IE'] = "IRELAND" 
     118    _countries['IL'] = "ISRAEL" 
     119    _countries['IT'] = "ITALY" 
     120    _countries['CI'] = "IVORY COAST" 
     121    _countries['JM'] = "JAMAICA" 
     122    _countries['JP'] = "JAPAN" 
     123    _countries['JO'] = "JORDAN" 
     124    _countries['KZ'] = "KAZAKHSTAN" 
     125    _countries['KE'] = "KENYA" 
     126    _countries['KW'] = "KUWAIT" 
     127    _countries['KG'] = "KYRGYZSTAN" 
     128    _countries['LA'] = "LAO PEOPLE'S DEM. REP." 
     129    _countries['LV'] = "LATVIA" 
     130    _countries['LB'] = "LEBANON" 
     131    _countries['LS'] = "LESOTHO" 
     132    _countries['LR'] = "LIBERIA" 
     133    _countries['LY'] = "LIBYAN ARAB JAMAHIRYA" 
     134    _countries['LI'] = "LIECHTENSTEIN" 
     135    _countries['LT'] = "LITHUANIA" 
     136    _countries['LU'] = "LUXEMBURG" 
     137    _countries['MO'] = "MACAU" 
     138    _countries['MK'] = "MACEDONIA, F.Y.R." 
     139    _countries['MG'] = "MADAGASCAR" 
     140    _countries['MW'] = "MALAWI" 
     141    _countries['MY'] = "MALAYSIA" 
     142    _countries['MV'] = "MALDIVES" 
     143    _countries['ML'] = "MALI" 
     144    _countries['MT'] = "MALTA" 
     145    _countries['MQ'] = "MARTINIQUE" 
     146    _countries['MR'] = "MAURITANIA" 
     147    _countries['MU'] = "MAURITIUS" 
     148    _countries['MX'] = "MEXICO" 
     149    _countries['MD'] = "MOLDOVA" 
     150    _countries['MC'] = "MONACO" 
     151    _countries['MN'] = "MONGOLIA" 
     152    _countries['ME'] = "MONTENEGRO" 
     153    _countries['MA'] = "MOROCCO" 
     154    _countries['MZ'] = "MOZAMBIQUE" 
     155    _countries['XX'] = "MULTIPLE COUNTRIES" 
     156    _countries['MM'] = "MYANAMAR" 
     157    _countries['NA'] = "NAMIBIA" 
     158    _countries['NP'] = "NEPAL" 
     159    _countries['AN'] = "NETHERLANDS ANTILLES" 
     160    _countries['NL'] = "NETHERLANDS" 
     161    _countries['NC'] = "NEW CALEDONIA" 
     162    _countries['NZ'] = "NEW ZEALAND" 
     163    _countries['NI'] = "NICARAGUA" 
     164    _countries['NE'] = "NIGER" 
     165    _countries['NG'] = "NIGERIA" 
     166    _countries['NO'] = "NORWAY" 
     167    _countries['OM'] = "OMAN" 
     168    _countries['PK'] = "PAKISTAN" 
     169    _countries['PA'] = "PANAMA" 
     170    _countries['PG'] = "PAPUA NEW GUINEA" 
     171    _countries['PY'] = "PARAGUAY" 
     172    _countries['PE'] = "PERU" 
     173    _countries['PH'] = "PHILIPPINES" 
     174    _countries['PL'] = "POLAND" 
     175    _countries['PT'] = "PORTUGAL" 
     176    _countries['PR'] = "PUERTO RICO" 
     177    _countries['QA'] = "QATAR" 
     178    _countries['KR'] = "REPUBLIC OF KOREA" 
     179    _countries['RE'] = "REUNION" 
     180    _countries['RO'] = "ROMANIA" 
     181    _countries['RU'] = "RUSSIA" 
     182    _countries['RW'] = "RWANDA" 
     183    _countries['LC'] = "SAINT LUCIA" 
     184    _countries['SM'] = "SAN MARINO" 
     185    _countries['ST'] = "SAO TOME - PRINCIPE" 
     186    _countries['SA'] = "SAUDI ARABIA" 
     187    _countries['SN'] = "SENEGAL" 
     188    _countries['RS'] = "SERBIA" 
     189    _countries['SC'] = "SEYCHELLES" 
     190    _countries['SL'] = "SIERRA LEONE" 
     191    _countries['SG'] = "SINGAPORE" 
     192    _countries['SK'] = "SLOVAKIA" 
     193    _countries['SI'] = "SLOVENIA" 
     194    _countries['SO'] = "SOMALIA" 
     195    _countries['ZA'] = "SOUTH AFRICA" 
     196    _countries['ES'] = "SPAIN" 
     197    _countries['LK'] = "SRI LANKA" 
     198    _countries['SD'] = "SUDAN" 
     199    _countries['SR'] = "SURINAM" 
     200    _countries['SE'] = "SWEDEN" 
     201    _countries['CH'] = "SWITZERLAND" 
     202    _countries['SY'] = "SYRIEN ARAB REPUBLIC" 
     203    _countries['TW'] = "TAIWAN, PROVINCE OF CHINA" 
     204    _countries['TJ'] = "TAJIKISTAN" 
     205    _countries['TH'] = "THAILAND" 
     206    _countries['TG'] = "TOGO" 
     207    _countries['TO'] = "TONGA" 
     208    _countries['TT'] = "TRINIDAD TOBAGO" 
     209    _countries['TN'] = "TUNISIA" 
     210    _countries['TR'] = "TURKEY" 
     211    _countries['TM'] = "TURKMENISTAN" 
     212    _countries['UG'] = "UGANDA" 
     213    _countries['UA'] = "UKRAINE" 
     214    _countries['TZ'] = "UN. REP. OF TANZANIA" 
     215    _countries['CM'] = "UN.-REP. OF CAMEROON" 
     216    _countries['AE'] = "UNITED ARAB EMIRATES" 
     217    _countries['GB'] = "UNITED KINGDOM" 
     218    _countries['US'] = "UNITED STATES OF AMERICA" 
     219    _countries['UY'] = "URUGUAY" 
     220    _countries['SU'] = "USSR" 
     221    _countries['UZ'] = "UZBEKISTAN" 
     222    _countries['VA'] = "VATICAN CITY STATE" 
     223    _countries['VE'] = "VENEZUELA" 
     224    _countries['VN'] = "VIETNAM" 
     225    _countries['EH'] = "WESTERN SAHARA" 
     226    _countries['YD'] = "YEMEN DEMOCRATIC" 
     227    _countries['YE'] = "YEMEN" 
     228    _countries['ZM'] = "ZAMBIA" 
     229    _countries['ZW'] = "ZIMBABWE" 
     230 
     231    @classmethod 
     232    def getCountries(cls): 
     233        return cls._countries 
     234 
     235    @classmethod 
     236    def getCountryList( cls ): 
     237        return cls._countries.values() 
     238 
     239    @classmethod 
     240    def getCountryById( cls, id ): 
     241        return cls._countries.get(id, "") 
     242 
     243    @classmethod 
     244    def getCountryKeys(cls): 
     245        return cls._countries.keys() 
     246 
     247    @classmethod 
     248    def getCountrySortedKeys(cls): 
     249        keys = cls.getCountryKeys() 
     250        keys.sort(cls._sortByValue) 
    247251        return keys 
    248252 
    249     def _sortByValue(self, v1, v2): 
    250         return cmp(self._countries[v1], self._countries[v2]) 
     253    @classmethod 
     254    def _sortByValue(cls, v1, v2): 
     255        return cmp(cls._countries[v1], cls._countries[v2]) 

  • indico/MaKaC/webinterface/common/regFilters.py

    rbdd862 r4dd389  
    4040        """ 
    4141        """ 
    42         if reg.getAccommodation().getAccommodationType() is None: 
    43             return self._showNoValue 
    44         if reg.getAccommodation().getAccommodationType() not in reg.getRegistrationForm().getAccommodationForm().getAccommodationTypesList(): 
    45             return self._showNoValue 
    46         return reg.getAccommodation().getAccommodationType().getId() in self._values 
     42        accomTypesList = len(reg.getRegistrationForm().getAccommodationForm().getAccommodationTypesList()) 
     43        if accomTypesList != len(self._values): 
     44            if reg.getAccommodation().getAccommodationType() is None: 
     45                return self._showNoValue 
     46            if reg.getAccommodation().getAccommodationType() not in accomTypesList: 
     47                return self._showNoValue 
     48            return reg.getAccommodation().getAccommodationType().getId() in self._values 
     49        else: 
     50            return True 
    4751 
    4852 
    … …  
    5559        """ 
    5660        """ 
    57  
    58         if reg.getSessionList(): 
    59             for sess in reg.getSessionList(): 
    60                 if sess.getId() in self._values: 
    61                     return True 
    62                 elif sess not in reg.getRegistrationForm().getSessionsForm().getSessionList(): 
    63                     return self._showNoValue 
    64         else: 
    65             return self._showNoValue 
    66         return False 
     61        if len(reg.getRegistrationForm().getSessionsForm().getSessions().values()) != len(self._values): 
     62            if reg.getSessionList(): 
     63                for sess in reg.getSessionList(): 
     64                    if sess.getId() in self._values: 
     65                        return True 
     66                    elif sess not in reg.getRegistrationForm().getSessionsForm().getSessionList(): 
     67                        return self._showNoValue 
     68            else: 
     69                return self._showNoValue 
     70            return False 
     71        else: 
     72            return True 
    6773 
    6874class SessionFirstPriorityFilterField( filters.FilterField ): 
    … …  
    95101        """ 
    96102        """ 
    97  
    98         if reg.getSocialEvents(): 
    99             for event in reg.getSocialEvents(): 
    100                 if event.getId() in self._values: 
    101                     return True 
    102                 elif event.getSocialEventItem() not in reg.getRegistrationForm().getSocialEventForm().getSocialEventList(): 
    103                     return self._showNoValue 
    104         else: 
    105             return self._showNoValue 
    106         return False 
     103        if (reg.getRegistrationForm().getSocialEventForm().getSocialEventList()) != len(self._values): 
     104            if reg.getSocialEvents(): 
     105                for event in reg.getSocialEvents(): 
     106                    if event.getId() in self._values: 
     107                        return True 
     108                    elif event.getSocialEventItem() not in reg.getRegistrationForm().getSocialEventForm().getSocialEventList(): 
     109                        return self._showNoValue 
     110            else: 
     111                return self._showNoValue 
     112            return False 
     113        return True 
    107114 
    108115class StatusesFilterField(filters.FilterField): 
    … …  
    118125    def __init__(self,conf,values,showNoValue=True ): 
    119126        filters.FilterField.__init__(self, conf, values, showNoValue) 
    120         self._confStatusSet = set([status.getCaption()+"-"+status.getId() for status in self._conf.getRegistrationForm().getStatusesList()]) 
     127        self._confStatusSet = set([status.getCaption()+"-"+status.getId() for status in self._conf.getRegistrationForm().getStatusesList(False)]) 
    121128 
    122129    def satisfies(self, reg): 
    123130        """ 
    124131        """ 
     132        ### If all the status values are selected, there is no need for filtering 
     133        values = 0 
     134        for status in self._conf.getRegistrationForm().getStatusesList(False): 
     135            values += len(status.getStatusValues()) + 1 
     136        if len(self._values) == values: 
     137            return True 
     138 
    125139        statusDict = reg.getStatuses() 
    126140 
    … …  
    175189 
    176190    def compare( self, r1, r2 ): 
    177         """ 
    178         """ 
    179         res1 = r1.getFamilyName().upper() 
    180         if r1.getFirstName() != "": 
    181             res1 = "%s, %s"%( res1, r1.getFirstName() ) 
    182         res2 = r2.getFamilyName().upper() 
    183         if r2.getFirstName() != "": 
    184             res2 = "%s, %s"%( res2, r2.getFirstName() ) 
    185         return cmp( res1, res2 ) 
     191        return cmp( r1.getFamilyName().upper() + r1.getFirstName(), r2.getFamilyName().upper() + r2.getFirstName() ) 
    186192 
    187193class PositionSF( RegistrantSortingField ): 

  • indico/MaKaC/webinterface/pages/registrants.py

    reefc00 r4dd389  
    7878        """ 
    7979        self._statuses = {} 
    80         for st in self._conf.getRegistrationForm().getStatusesList(): 
     80        for st in self._conf.getRegistrationForm().getStatusesList(False): 
    8181            self._statuses[st.getId()] = st.getStatusValues() 
    8282 
    … …  
    8888        self._dispopts = {"PersonalData":[ "Id", "LastName", "FirstName", "Email", "Position", "Institution","Phone","City","Country","Address","isPayed","idpayment","amountToPay"]} 
    8989        self._dispopts["statuses"]=[] 
    90         for st in self._conf.getRegistrationForm().getStatusesList(): 
     90        for st in self._conf.getRegistrationForm().getStatusesList(False): 
    9191            self._dispopts["statuses"].append("s-%s"%st.getId()) 
    9292        #if self._conf.getRegistrationForm().getAccommodationForm().isEnabled(): 
    … …  
    151151            columns["FirstName"]="First name" 
    152152 
    153             for st in self._conf.getRegistrationForm().getStatusesList(): 
     153            for st in self._conf.getRegistrationForm().getStatusesList(False): 
    154154                columns["s-%s"%st.getId()]=st.getCaption() 
    155155            for sect in self._conf.getRegistrationForm().getGeneralSectionFormsList(): 
    … …  
    190190    def _getStatusesHTML(self): 
    191191        self._statusesObjects = {} 
    192         for st in self._conf.getRegistrationForm().getStatusesList(): 
     192        for st in self._conf.getRegistrationForm().getStatusesList(False): 
    193193            self._statusesObjects[st.getId()] = st 
    194194        return WRegistrantsFilterStatuses(self._statuses, self._filterCrit, self._statusesObjects).getHTML() 
    … …  
    329329        url = urlHandlers.UHRegistrantModification.getURL(reg) 
    330330        fullName = reg.getFullName() 
    331         regdict={} 
    332         regdict["FirstName"]=reg.getFirstName() 
    333         regdict["LastName"]=reg.getSurName() 
    334         regdict["Institution"]=reg.getInstitution() 
    335         regdict["Position"] = reg.getPosition() 
    336         regdict["Phone"]=reg.getPhone() 
    337         regdict["City"]= reg.getCity() 
    338         regdict["Country"]=CountryHolder().getCountryById(reg.getCountry()) 
    339         regdict["Address"] = reg.getAddress() 
    340         regdict["Email"]=reg.getEmail() 
    341         regdict["isPayed"]=reg.isPayedText() 
    342         regdict["idpayment"]=reg.getIdPay() 
    343         regdict["amountToPay"]="%.2f %s"%(reg.getTotal(), reg.getConference().getRegistrationForm().getCurrency()) 
    344         regdict["Accommodation"]="" 
    345         regdict["DepartureDate"]="" 
    346         regdict["ArrivalDate"]="" 
    347         if reg.getAccommodation() is not None: 
    348             if reg.getAccommodation().getAccommodationType() is not None: 
    349                 regdict["Accommodation"]= reg.getAccommodation().getAccommodationType().getCaption() 
    350             if reg.getAccommodation().getDepartureDate() is not None: 
    351                 regdict["DepartureDate"]=reg.getAccommodation().getDepartureDate().strftime("%d-%B-%Y") 
    352             if reg.getAccommodation().getArrivalDate() is not None: 
    353                 regdict["ArrivalDate"]=reg.getAccommodation().getArrivalDate().strftime("%d-%B-%Y") 
    354  
    355         events = reg.getSocialEvents() 
    356         items =[] 
    357         for item in events: 
    358             items.append("%s (%s)"%(item.getCaption(), item.getNoPlaces())) 
    359         regdict["SocialEvents"] = "<br>".join(items) 
    360  
    361         regdict["ReasonParticipation"]=reg.getReasonParticipation() or "" 
    362  
    363         regdict["RegistrationDate"]=  _("""--  _("date unknown")--""") 
    364         if reg.getRegistrationDate() is not None: 
    365             regdict["RegistrationDate"]=reg.getAdjustedRegistrationDate().strftime("%d-%B-%Y %H:%M") 
    366  
    367         sessions = reg.getSessionList() 
    368         sesslist =[] 
    369         for sess in sessions: 
    370             sesslist.append(sess.getTitle()) 
    371         regdict["Sessions"] ="<br>".join(sesslist) 
    372  
    373         for strf in self._conf.getRegistrationForm().getStatusesList(): 
    374             cap=  _("""<span style="white-space:nowrap">--  _("not set") --</span>""") 
    375             st=reg.getStatusById(strf.getId()) 
    376             if st.getStatusValue() is not None: 
    377                 cap=st.getStatusValue().getCaption() 
    378             regdict["s-%s"%st.getId()]=cap 
    379  
    380         for group in reg.getMiscellaneousGroupList(): 
    381                 regdict[group.getId()]=group.getTitle() 
    382                 for fld in group.getResponseItemList(): 
    383                     regdict["%s-%s"%(group.getId(),fld.getId())]=fld.getValue() 
    384  
    385         res =[] 
    386         res.append("""<td valign="top" align="right" width="3%%"><input onchange="javascript:isSelected('registrant%s')" type="checkbox" name="registrant" value="%s"></td> 
     331        regdict = registration.RegistrantMapping(reg) 
     332        res = ("""<td valign="top" align="right" width="3%%"><input onchange="javascript:isSelected('registrant%s')" type="checkbox" name="registrant" value="%s"></td> 
    387333                    """%(reg.getId(),self.htmlText(reg.getId()))) 
    388334        if "Id" in self._groupsorder["PersonalData"]: 
    389             res.append("""<td valign="top" nowrap class="CRLabstractLeftDataCell">%s</td> 
    390                           <td valign="top" nowrap class="CRLabstractDataCell"><a href=%s>%s</a></td> 
    391                        """%(reg.getId(), quoteattr(str(url)), self.htmlText(fullName))) 
    392         else: 
    393             res.append("""<td valign="top" nowrap class="CRLabstractDataCell"><a href=%s>%s</a></td> 
    394                     """%(quoteattr(str(url)), self.htmlText(fullName))) 
     335            res += ("""<td valign="top" nowrap class="CRLabstractLeftDataCell">%s</td> 
     336                       """%reg.getId()) 
     337        res += ("""<td valign="top" nowrap class="CRLabstractDataCell"><a href=%s>%s</a></td> 
     338                   """%(quoteattr(str(url)), self.htmlText(fullName))) 
    395339        # Fisrtly the "PersonalData" 
    396         for key in self._groupsorder["PersonalData"]: 
    397             if key == "Name" or key == "Id": 
    398                 continue 
    399             v = "&nbsp;" 
    400             if regdict.has_key(key) and regdict[key].strip() != "": 
    401                 v = regdict[key] 
    402             res.append( """<td valign="top"  class="CRLabstractDataCell">%s</td>"""%v) 
    403         for groupkey in self._groupsorder.keys(): 
    404             if groupkey == "PersonalData": 
    405                 continue 
    406             for key in  self._groupsorder[groupkey]: 
    407                 v = "&nbsp;" 
    408                 if regdict.has_key(key) and str(regdict[key]).strip() != "": 
    409                     v = regdict[key] 
    410                 res.append( """<td valign="top"  class="CRLabstractDataCell">%s</td>"""%v) 
     340        res += "".join(["""<td valign="top"  class="CRLabstractDataCell">%s</td>"""%regdict[key] for key in self._groupsorder["PersonalData"] if key != "Name" and key != "Id"]) 
     341        res += "".join(["""<td valign="top"  class="CRLabstractDataCell">%s</td>"""%regdict[key] for groupkey in self._groupsorder.keys() if groupkey != "PersonalData" for key in self._groupsorder[groupkey] ]) 
    411342        html = """ 
    412343            <tr id="registrant%s" style="background-color: transparent;" onmouseout="javascript:onMouseOut('registrant%s')" onmouseover="javascript:onMouseOver('registrant%s')"> 
    413344                %s 
    414345            </tr> 
    415                 """%(reg.getId(),reg.getId(),reg.getId(), "".join(res)) 
     346                """%(reg.getId(),reg.getId(),reg.getId(), res) 
    416347        return html 
    417348 
    … …  
    454385 
    455386        extraInfo = "" 
    456         if self._conf.getRegistrationForm().getStatusesList(): 
     387        if self._conf.getRegistrationForm().getStatusesList(False): 
    457388            extraInfo = _("""<table align="center" cellspacing="0" width="100%%"> 
    458389                                <tr> 
    … …  
    505436 
    506437        sortingField = self._sortingCrit.getField() 
    507  
    508438        vars["filterPostURL"]=quoteattr("%s#results"%str(urlHandlers.UHConfModifRegistrantList.getURL(self._conf))) 
    509         l=[] 
    510         cl = self._conf.getRegistrantsList(True) 
     439        cl = self._conf.getRegistrantsList(False) 
    511440        f = filters.SimpleFilter(self._filterCrit,self._sortingCrit) 
    512         regl=[] 
    513         eventItems = self._conf.getRegistrationForm().getSocialEventForm().getSocialEventList() 
    514441        vars["eve"]="" 
    515442        vars["columns"]=self._getRegColumnHTML(sortingField) 
    516         for reg in f.apply(cl): 
    517             l.append(self._getRegistrantsHTML(reg)) 
    518             regl.append(reg.getId()) 
    519  
     443        filtered = f.apply(cl) 
     444        l = [self._getRegistrantsHTML(reg) for reg in filtered] 
     445        regl = [reg.getId() for reg in filtered] 
    520446        if self._order =="up": 
    521447            l.reverse() 
Note: See TracChangeset for help on using the changeset viewer.