Permalink
Browse files

Merge branch 'master' of github.com:coderholic/django-cities

  • Loading branch information...
coderholic committed Oct 16, 2012
2 parents 45d294b + a573f2c commit e9b46f989f6190b930e9be599b57f38a912c46a4
Showing with 6 additions and 6 deletions.
  1. +4 −4 cities/admin.py
  2. +1 −1 cities/conf.py
  3. +1 −1 setup.py
View
@@ -47,8 +47,8 @@ class GeoAltNameAdmin(admin.ModelAdmin):
class PostalCodeAdmin(admin.ModelAdmin):
ordering = ['code']
- list_display = ['code', 'name', 'region_name', 'subregion_name', 'district_name']
- search_fields = ['code', 'name', 'region_name', 'subregion_name', 'district_name']
+ list_display = ['code', 'country', 'region', 'subregion']
+ search_fields = ['code', 'country__name', 'region__name', 'subregion__name']
raw_id_fields = Region.levels
-
-[admin.site.register(postal_code, PostalCodeAdmin) for postal_code in postal_codes.values()]
+
+admin.site.register(PostalCode, PostalCodeAdmin)
View
@@ -62,7 +62,7 @@
]
# See http://www.geonames.org/export/codes.html
-city_types = ['PPL','PPLA','PPLC','PPLA2','PPLA3','PPLA4']
+city_types = ['PPL','PPLA','PPLC','PPLA2','PPLA3','PPLA4', 'PPLG']
district_types = ['PPLX']
# Command-line import options
View
@@ -15,7 +15,7 @@ def read(fname):
author='Ben Dowling',
author_email='ben.m.dowling@gmail.com',
url='https://github.com/coderholic/django-cities',
- packages=find_packages(),
+ packages=find_packages(exclude=['example']),
include_package_data=True,
zip_safe=False,
long_description=read('README.md'),

0 comments on commit e9b46f9

Please sign in to comment.