Don't show 'None' for provider column in handle bad layers dialog for…

… non-vector layers (cherry picked from commit 62b8f08)
qgis · Mar 11, 2021 · 13d3ce0 · 13d3ce0
1 parent 0ef7d3b
commit 13d3ce0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/src/app/qgshandlebadlayers.cpp b/src/app/qgshandlebadlayers.cpp
@@ -123,24 +123,24 @@ QgsHandleBadLayers::QgsHandleBadLayers( const QList<QDomNode> &layers )
   {
     const QDomNode &node = mLayers[i];
 
-    QString name = node.namedItem( QStringLiteral( "layername" ) ).toElement().text();
-    QString type = node.toElement().attribute( QStringLiteral( "type" ) );
-    QString id = node.namedItem( QStringLiteral( "id" ) ).toElement().text();
-    QString datasource = node.namedItem( QStringLiteral( "datasource" ) ).toElement().text();
+    const QString name = node.namedItem( QStringLiteral( "layername" ) ).toElement().text();
+    const QString type = node.toElement().attribute( QStringLiteral( "type" ) );
+    const QString layerId = node.namedItem( QStringLiteral( "id" ) ).toElement().text();
+    const QString datasource = node.namedItem( QStringLiteral( "datasource" ) ).toElement().text();
     const QString provider = node.namedItem( QStringLiteral( "provider" ) ).toElement().text();
 
     bool providerFileBased = false;
     if ( const QgsProviderMetadata *metadata = QgsProviderRegistry::instance()->providerMetadata( provider ) )
       providerFileBased = metadata->providerCapabilities() & QgsProviderMetadata::FileBasedUris;
 
     const QString basepath = QFileInfo( datasource ).absolutePath();
-    mOriginalFileBase[ node.namedItem( QStringLiteral( "id" ) ).toElement().text() ].append( basepath );
+    mOriginalFileBase[ layerId ].append( basepath );
 
-    QgsDebugMsg( QStringLiteral( "name=%1 type=%2 provider=%3 datasource='%4'" )
-                 .arg( name,
-                       type,
-                       vectorProvider,
-                       datasource ) );
+    QgsDebugMsgLevel( QStringLiteral( "name=%1 type=%2 provider=%3 datasource='%4'" )
+                      .arg( name,
+                            type,
+                            provider,
+                            datasource ), 2 );
 
     mLayerList->setRowCount( j + 1 );
 
@@ -153,10 +153,11 @@ QgsHandleBadLayers::QgsHandleBadLayers( const QList<QDomNode> &layers )
 
     item = new QTableWidgetItem( type );
     item->setData( static_cast< int >( CustomRoles::ProviderIsFileBased ), providerFileBased );
+    item->setData( static_cast< int >( CustomRoles::LayerId ), layerId );
     item->setFlags( item->flags() & ~Qt::ItemIsEditable );
     mLayerList->setItem( j, 1, item );
 
-    item = new QTableWidgetItem( vectorProvider );
+    item = new QTableWidgetItem( provider );
     item->setFlags( item->flags() & ~Qt::ItemIsEditable );
     mLayerList->setItem( j, 2, item );
 

diff --git a/src/app/qgshandlebadlayers.h b/src/app/qgshandlebadlayers.h
@@ -77,6 +77,7 @@ class APP_EXPORT QgsHandleBadLayers
       Index = Qt::UserRole,
       ProviderIsFileBased,
       DataSourceIsChanged,
+      LayerId,
     };
 
     QPushButton *mBrowseButton = nullptr;