Merge remote-tracking branch 'origin/main'

This commit is contained in:
2023-08-08 13:54:19 +03:00
2 changed files with 6 additions and 3 deletions

View File

@@ -125,7 +125,7 @@ class Admin_UserProfile(Admin_BaseIconModel):
('1С', {
'classes': ['wide'],
'fields': (
('id_1s', 'name',),
('name',),
)
}),
)

View File

@@ -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)}')