Fix regression in connection tree module (#3674)

Fix issue #3666
RedisInsight · Aug 17, 2016 · 31a7709 · 31a7709
1 parent 80d9416
commit 31a7709
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/modules/connections-tree/items/abstractnamespaceitem.cpp b/src/modules/connections-tree/items/abstractnamespaceitem.cpp
@@ -74,7 +74,7 @@ void KeysTreeRenderer::renderLazily(
     QSharedPointer<AbstractNamespaceItem> namespaceItem = parent->findChildNamespace(firstNamespaceName);
 
     if (namespaceItem.isNull()) {
-        QString namespaceFullPath = fullKey.mid(0, fullKey.indexOf(firstNamespaceName) + firstNamespaceName.size());
+        QString namespaceFullPath = fullKey.mid(0, fullKey.indexOf(notProcessedKeyPart) + firstNamespaceName.size());
         namespaceItem = QSharedPointer<NamespaceItem>(new NamespaceItem(namespaceFullPath,
                                                                         m_operations, currentParent,
                                                                         parent->model(), settings));

diff --git a/src/modules/connections-tree/items/databaseitem.cpp b/src/modules/connections-tree/items/databaseitem.cpp
@@ -29,6 +29,7 @@ DatabaseItem::DatabaseItem(unsigned int index, int keysCount,
       m_parentView(nullptr)
 {        
     m_renderingSettings.nsSeparator = operations->getNamespaceSeparator();
+    m_renderingSettings.dbIndex = index;
 }
 
 DatabaseItem::~DatabaseItem()

diff --git a/src/modules/connections-tree/model.cpp b/src/modules/connections-tree/model.cpp
@@ -143,7 +143,7 @@ void Model::onItemChildsLoaded(QWeakPointer<TreeItem> item)
 
     auto index = getIndexFromItem(item);
 
-    if (!index.isValid())
+    if (!index.isValid() || item.toStrongRef()->childCount() == 0)
         return;
 
     emit beginInsertRows(index, 0, item.toStrongRef()->childCount() - 1);