diff --git a/mathesar/urls.py b/mathesar/urls.py index 57beb50da3..b35d9526e5 100644 --- a/mathesar/urls.py +++ b/mathesar/urls.py @@ -24,7 +24,6 @@ path('administration/users/', views.admin_home, name='admin_users_home'), path('administration/users//', views.admin_home, name='admin_users_edit'), path('administration/update/', views.admin_home, name='admin_update'), - path('databases/', views.databases_list_route, name='databases_list_route'), path('i18n/', include('django.conf.urls.i18n')), re_path( r'^db/(?P\d+)/schemas/(?P\d+)/', diff --git a/mathesar/views.py b/mathesar/views.py index 986b51330a..f5542debfc 100644 --- a/mathesar/views.py +++ b/mathesar/views.py @@ -3,7 +3,7 @@ from django.conf import settings from django.contrib.auth.decorators import login_required from django.contrib.auth.mixins import LoginRequiredMixin -from django.shortcuts import render, redirect +from django.shortcuts import render from modernrpc.exceptions import RPCException from modernrpc.views import RPCEntryPoint @@ -120,21 +120,6 @@ class MathesarRPCEntryPoint(LoginRequiredMixin, RPCEntryPoint): @login_required def home(request): - database_list = get_database_list(request) - number_of_databases = len(database_list) - if number_of_databases > 1: - return redirect('databases_list_route') - elif number_of_databases == 1: - db = database_list[0] - return redirect('database_route', database_id=db['id']) - else: - return render(request, 'mathesar/index.html', { - 'common_data': get_common_data(request) - }) - - -@login_required -def databases_list_route(request): return render(request, 'mathesar/index.html', { 'common_data': get_common_data(request) }) diff --git a/mathesar_ui/src/components/AppHeader.svelte b/mathesar_ui/src/components/AppHeader.svelte index 7d051e6f05..f5096ab2e6 100644 --- a/mathesar_ui/src/components/AppHeader.svelte +++ b/mathesar_ui/src/components/AppHeader.svelte @@ -1,41 +1,28 @@
@@ -72,39 +44,6 @@ {#if isNormalRoutingContext}
- {#if schema && database} - - - - {$_('shortcuts')} - - - {$_('new_table_from_scratch')} - - - {$_('new_table_from_data_import')} - - - {$_('open_data_explorer')} - - - {/if} {#if $userProfile} - - {$_('databases')} - {#if $userProfile.isMathesarAdmin} diff --git a/mathesar_ui/src/components/breadcrumb/Breadcrumb.svelte b/mathesar_ui/src/components/breadcrumb/Breadcrumb.svelte index ebdf377ef8..b64cce82ee 100644 --- a/mathesar_ui/src/components/breadcrumb/Breadcrumb.svelte +++ b/mathesar_ui/src/components/breadcrumb/Breadcrumb.svelte @@ -1,6 +1,7 @@ -{#if item.type === 'home'} - - -{:else if item.type === 'database'} - +{#if item.type === 'database'} -{:else if item.type === 'schema'} +{:else if item.type === 'schema'} -{:else if item.type === 'table'} +{:else if item.type === 'table'} {:else if item.type === 'exploration'} - {:else if item.type === 'simple'} - + {#if item.prependSeparator} + + {/if}