Ignore:
Timestamp:
9 Apr 2012, 06:34:38 (13 years ago)
Author:
Henrik Bettermann
Message:

Remove Nigerian lgas from base package. LGAs are not core data.

Use the COUNTRIES instead of NATS.

Location:
main/waeup.kofa/trunk/src/waeup/kofa/students
Files:
2 deleted
2 edited

Legend:

Unmodified
Added
Removed

  • main/waeup.kofa/trunk/src/waeup/kofa/students/interfaces.py

    r8008 r8069  
    232232
    233233    nationality = schema.Choice(
    234         source = nats_vocab,
     234        vocabulary = nats_vocab,
    235235        title = _(u'Nationality'),
    236         default = 'nigeria',
    237236        required = False,
    238237        )

  • main/waeup.kofa/trunk/src/waeup/kofa/students/vocabularies.py

    r7915 r8069  
    2727from waeup.kofa.interfaces import SimpleKofaVocabulary
    2828from waeup.kofa.interfaces import MessageFactory as _
    29 from waeup.kofa.students.lgas import LGAS
    30 from waeup.kofa.students.nats import NATS
     29from waeup.kofa.utils.helpers import get_sorted_preferred
     30from waeup.kofa.utils.countries import COUNTRIES
    3131from waeup.kofa.university.vocabularies import course_levels
    3232
    33 lgas_vocab = SimpleKofaVocabulary(
    34     *sorted([(x[1],x[0]) for x in LGAS]))
    3533
    36 nats_vocab = SimpleKofaVocabulary(
    37     *sorted([(x[1],x[0]) for x in NATS]))
     34#: a tuple of tuples (<COUNTRY-NAME>, <ISO-CODE>) with Nigeria first.
     35COUNTRIES = get_sorted_preferred(COUNTRIES, ['NG'])
     36nats_vocab = SimpleKofaVocabulary(*COUNTRIES)
    3837
    3938def study_levels(studycourse):
Note: See TracChangeset for help on using the changeset viewer.