|
|
@@ -36,7 +36,7 @@ from beeswax.models import SavedQuery
|
|
|
from beeswax.server import dbms
|
|
|
from beeswax.server.dbms import get_query_server_config
|
|
|
from desktop.lib.view_util import location_to_url
|
|
|
-from metadata.conf import has_optimizer, has_navigator, get_optimizer_url, get_navigator_url
|
|
|
+from metadata.conf import has_optimizer, has_catalog, get_optimizer_url, get_navigator_url
|
|
|
from notebook.connectors.base import Notebook, QueryError
|
|
|
from notebook.models import make_notebook
|
|
|
|
|
|
@@ -87,7 +87,7 @@ def databases(request):
|
|
|
'partitions': [],
|
|
|
'has_write_access': has_write_access(request.user),
|
|
|
'is_optimizer_enabled': has_optimizer(),
|
|
|
- 'is_navigator_enabled': has_navigator(request.user),
|
|
|
+ 'is_navigator_enabled': has_catalog(request.user),
|
|
|
'optimizer_url': get_optimizer_url(),
|
|
|
'navigator_url': get_navigator_url(),
|
|
|
'is_embeddable': request.GET.get('is_embeddable', False),
|
|
|
@@ -261,7 +261,7 @@ def show_tables(request, database=None):
|
|
|
'partitions': [],
|
|
|
'has_write_access': has_write_access(request.user),
|
|
|
'is_optimizer_enabled': has_optimizer(),
|
|
|
- 'is_navigator_enabled': has_navigator(request.user),
|
|
|
+ 'is_navigator_enabled': has_catalog(request.user),
|
|
|
'optimizer_url': get_optimizer_url(),
|
|
|
'navigator_url': get_navigator_url(),
|
|
|
'is_embeddable': request.GET.get('is_embeddable', False),
|
|
|
@@ -346,7 +346,7 @@ def describe_table(request, database, table):
|
|
|
'database': database,
|
|
|
'has_write_access': has_write_access(request.user),
|
|
|
'is_optimizer_enabled': has_optimizer(),
|
|
|
- 'is_navigator_enabled': has_navigator(request.user),
|
|
|
+ 'is_navigator_enabled': has_catalog(request.user),
|
|
|
'optimizer_url': get_optimizer_url(),
|
|
|
'navigator_url': get_navigator_url(),
|
|
|
'is_embeddable': request.GET.get('is_embeddable', False),
|
|
|
@@ -608,7 +608,7 @@ def describe_partitions(request, database, table):
|
|
|
'request': request,
|
|
|
'has_write_access': has_write_access(request.user),
|
|
|
'is_optimizer_enabled': has_optimizer(),
|
|
|
- 'is_navigator_enabled': has_navigator(request.user),
|
|
|
+ 'is_navigator_enabled': has_catalog(request.user),
|
|
|
'optimizer_url': get_optimizer_url(),
|
|
|
'navigator_url': get_navigator_url(),
|
|
|
'is_embeddable': request.GET.get('is_embeddable', False),
|