diff --git a/AuthApp/admin.py b/AuthApp/admin.py index 7589aae..f83ba94 100644 --- a/AuthApp/admin.py +++ b/AuthApp/admin.py @@ -125,7 +125,7 @@ class Admin_UserProfile(Admin_BaseIconModel): ('1С', { 'classes': ['wide'], 'fields': ( - ('id_1s', 'name',), + ('name',), ) }), ) diff --git a/ReferenceDataApp/funcs.py b/ReferenceDataApp/funcs.py index 49e8c0e..120ba73 100644 --- a/ReferenceDataApp/funcs.py +++ b/ReferenceDataApp/funcs.py @@ -58,7 +58,7 @@ def create_airports_by_airportsList(airportsList, city=None): kwargs.update({'iata_code': airport_Dict['iata']}) airport = Airport.objects.get(**kwargs) except Airport.DoesNotExist: - print(f'{airport_Dict["int_name"]} не найден в БД > добавляем') + print(f' - - {airport_Dict["int_name"]} не найден в БД > добавляем') except Exception as e: print(f'error = {str(e)}') @@ -181,10 +181,13 @@ def parse_data(): if city_Dict['name:ru']: kwargs.update({'name_ru': city_Dict['name:ru']}) + if country: + kwargs.update({'country': country}) + try: city = City.objects.get(**kwargs) except City.DoesNotExist: - print(f'{city_Dict["name:en"]} не найдена в БД > добавляем') + print(f' - {city_Dict["name:en"]} не найдена в БД > добавляем') except Exception as e: print(f'error = {str(e)}')