|
|
@@ -309,12 +309,21 @@ from desktop.views import _ko
|
|
|
</a>
|
|
|
<!-- /ko -->
|
|
|
<!-- ko ifnot: selectedSource().selectedNamespace().selectedDatabase() -->
|
|
|
+ <!-- ko if: selectedSource().namespaceRefreshEnabled() || selectedSource().namespaces().length > 1-->
|
|
|
<a data-bind="click: back">
|
|
|
<i class="fa fa-chevron-left assist-breadcrumb-back"></i>
|
|
|
- <i class="fa assist-breadcrumb-text" data-bind="css: { 'fa-snowflake-o': selectedSource().namespaces().length > 1, 'fa-server': selectedSource().namespaces().length <= 1 }"></i>
|
|
|
+ <i class="fa fa-snowflake-o assist-breadcrumb-text"></i>
|
|
|
<span class="assist-breadcrumb-text" data-bind="text: breadcrumb, attr: {'title': breadcrumb() + ' (' + selectedSource().sourceType + ')' }"></span>
|
|
|
</a>
|
|
|
<!-- /ko -->
|
|
|
+ <!-- ko if: !selectedSource().namespaceRefreshEnabled() && selectedSource().namespaces().length <= 1 -->
|
|
|
+ <a data-bind="click: back">
|
|
|
+ <i class="fa fa-chevron-left assist-breadcrumb-back"></i>
|
|
|
+ <i class="fa fa-server assist-breadcrumb-text"></i>
|
|
|
+ <span class="assist-breadcrumb-text" data-bind="text: breadcrumb"></span>
|
|
|
+ </a>
|
|
|
+ <!-- /ko -->
|
|
|
+ <!-- /ko -->
|
|
|
<!-- /ko -->
|
|
|
<!-- ko ifnot: selectedSource().selectedNamespace() -->
|
|
|
<a data-bind="click: back">
|
|
|
@@ -771,8 +780,10 @@ from desktop.views import _ko
|
|
|
<div class="assist-db-header-actions">
|
|
|
<!-- ko ifnot: loading -->
|
|
|
<span class="assist-tables-counter">(<span data-bind="text: filteredNamespaces().length"></span>)</span>
|
|
|
+ <!-- ko if: namespaceRefreshEnabled -->
|
|
|
<a class="inactive-action" href="javascript:void(0)" data-bind="click: triggerRefresh"><i class="pointer fa fa-refresh" data-bind="css: { 'fa-spin blue' : loading }" title="${_('Refresh')}"></i></a>
|
|
|
<!-- /ko -->
|
|
|
+ <!-- /ko -->
|
|
|
<!-- ko if: loading -->
|
|
|
<i class="fa fa-refresh fa-spin blue" title="${_('Refresh')}"></i>
|
|
|
<!-- /ko -->
|
|
|
@@ -1336,7 +1347,7 @@ from desktop.views import _ko
|
|
|
if (self.selectedSource().selectedNamespace().selectedDatabase()) {
|
|
|
return self.selectedSource().selectedNamespace().selectedDatabase().catalogEntry.name
|
|
|
}
|
|
|
- if (self.selectedSource().namespaces().length > 1) {
|
|
|
+ if (self.selectedSource().namespaceRefreshEnabled() || self.selectedSource().namespaces().length > 1) {
|
|
|
return self.selectedSource().selectedNamespace().name
|
|
|
}
|
|
|
}
|
|
|
@@ -1352,7 +1363,7 @@ from desktop.views import _ko
|
|
|
if (self.selectedSource() && self.selectedSource().selectedNamespace()) {
|
|
|
if (self.selectedSource().selectedNamespace().selectedDatabase()) {
|
|
|
self.selectedSource().selectedNamespace().selectedDatabase(null);
|
|
|
- } else if (self.selectedSource().namespaces().length > 1) {
|
|
|
+ } else if (self.selectedSource().namespaceRefreshEnabled() || self.selectedSource().namespaces().length > 1) {
|
|
|
self.selectedSource().selectedNamespace(null)
|
|
|
} else {
|
|
|
self.selectedSource(null);
|