diff --git a/ReferenceDataApp/admin.py b/ReferenceDataApp/admin.py index 2d5e239..3b2bf3e 100644 --- a/ReferenceDataApp/admin.py +++ b/ReferenceDataApp/admin.py @@ -61,8 +61,8 @@ class Admin_Airport(Admin_Trans_BaseModel): 'order', 'modifiedDT', 'createDT'] search_fields = ['id', 'name_en', 'name_ru', 'city__name', 'city__country__name', 'iata_code', 'icao_code', 'international_name'] list_filter = ['city__country'] - raw_id_fields = [ - 'city' - ] + # raw_id_fields = [ + # 'city' + # ] admin.site.register(Airport, Admin_Airport) \ No newline at end of file diff --git a/RoutesApp/funcs.py b/RoutesApp/funcs.py index 0cd4c08..34ceecc 100644 --- a/RoutesApp/funcs.py +++ b/RoutesApp/funcs.py @@ -36,7 +36,6 @@ def get_profile_new_route_page_html(request, data): ) cargo_type_choices = ( - ('passenger', _('Пассажир')), ('cargo', _('Груз')), ('parcel', _('Бандероль')), ('package', _('Посылка')), @@ -51,6 +50,7 @@ def get_profile_new_route_page_html(request, data): ) cargo_type_choices = ( + ('passenger', _('Пассажир')), ('cargo', _('Груз')), ('parcel', _('Бандероль')), ('package', _('Посылка')), diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css index 6407241..d0ad318 100644 --- a/static/css/styles(boris).css +++ b/static/css/styles(boris).css @@ -2875,4 +2875,10 @@ color: #f00; margin-bottom: 20px; display: block; +} + +/*b_profile_first_page*/ + +.title_b_first_page{ + margin-top: 70px; } \ No newline at end of file diff --git a/static/js/user_profile_2.js b/static/js/user_profile_2.js index be0c599..42c8c2a 100644 --- a/static/js/user_profile_2.js +++ b/static/js/user_profile_2.js @@ -92,8 +92,10 @@ function select_tab_profile (el,url,owner_type=null) { function selectTabProfileIfHisNotSelected (url) { - let el_f_select = document.querySelector(`[data-ajax-url=${url}]`) - el_f_select.classList.add('selected') + if (url !== 'new_route_view') { + let el_f_select = document.querySelector(`[data-ajax-url=${url}]`) + el_f_select.classList.add('selected') + } } function clickONTHEAPROfileBTN (el) { diff --git a/templates/blocks/profile/b_new_route.html b/templates/blocks/profile/b_new_route.html index 8167f3d..2d4485e 100644 --- a/templates/blocks/profile/b_new_route.html +++ b/templates/blocks/profile/b_new_route.html @@ -60,7 +60,7 @@