Răsfoiți Sursa

HUE-7559 [assist] Pre-select the source and root item for the collections panel

Enrico Berti 8 ani în urmă
părinte
comite
fae12bc
1 a modificat fișierele cu 15 adăugiri și 9 ștergeri
  1. 15 9
      desktop/core/src/desktop/templates/assist.mako

+ 15 - 9
desktop/core/src/desktop/templates/assist.mako

@@ -1271,15 +1271,21 @@ from notebook.conf import ENABLE_QUERY_BUILDER, ENABLE_QUERY_SCHEDULING, get_ord
 
       AssistDbPanel.prototype.init = function () {
         var self = this;
-        var storageSourceType = self.apiHelper.getFromTotalStorage('assist', 'lastSelectedSource');
-
-        if (!self.selectedSource()) {
-          if (self.options.activeSourceType) {
-            self.selectedSource(self.sourceIndex[self.options.activeSourceType]);
-            self.setDatabaseWhenLoaded();
-          } else if (storageSourceType && self.sourceIndex[storageSourceType]) {
-            self.selectedSource(self.sourceIndex[storageSourceType]);
-            self.setDatabaseWhenLoaded();
+        if (self.options.isSolr) {
+          self.selectedSource(self.sourceIndex['solr']);
+          self.setDatabaseWhenLoaded();
+        }
+        else {
+          var storageSourceType = self.apiHelper.getFromTotalStorage('assist', 'lastSelectedSource');
+
+          if (!self.selectedSource()) {
+            if (self.options.activeSourceType) {
+              self.selectedSource(self.sourceIndex[self.options.activeSourceType]);
+              self.setDatabaseWhenLoaded();
+            } else if (storageSourceType && self.sourceIndex[storageSourceType]) {
+              self.selectedSource(self.sourceIndex[storageSourceType]);
+              self.setDatabaseWhenLoaded();
+            }
           }
         }
       };