Don't try to show CRS in map layer model for aspatial tables

(cherry picked from commit cdaf99d)
qgis · Nov 13, 2018 · e288bdb · e288bdb
1 parent 2bd98ff
commit e288bdb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/core/qgsmaplayermodel.cpp b/src/core/qgsmaplayermodel.cpp
@@ -233,7 +233,7 @@ QVariant QgsMapLayerModel::data( const QModelIndex &index, int role ) const
       if ( !layer )
         return QVariant();
 
-      if ( !mShowCrs )
+      if ( !mShowCrs || !layer->isSpatial() )
       {
         return layer->name();
       }

diff --git a/tests/src/python/test_qgsmaplayermodel.py b/tests/src/python/test_qgsmaplayermodel.py
@@ -194,20 +194,26 @@ def testDisplayRole(self):
     def testDisplayRoleShowCrs(self):
         l1 = create_layer('l1')
         l2 = create_layer('l2')
-        QgsProject.instance().addMapLayers([l1, l2])
+        l3 = QgsVectorLayer("NoGeometry?field=fldtxt:string&field=fldint:integer",
+                            'no geom', "memory")
+
+        QgsProject.instance().addMapLayers([l1, l2, l3])
         m = QgsMapLayerModel()
         m.setShowCrs(True)
         self.assertEqual(m.data(m.index(0, 0), Qt.DisplayRole), 'l1 [EPSG:3111]')
         self.assertEqual(m.data(m.index(1, 0), Qt.DisplayRole), 'l2 [EPSG:3111]')
+        self.assertEqual(m.data(m.index(2, 0), Qt.DisplayRole), 'no geom')
+
         m.setAllowEmptyLayer(True)
         self.assertFalse(m.data(m.index(0, 0), Qt.DisplayRole))
         self.assertEqual(m.data(m.index(1, 0), Qt.DisplayRole), 'l1 [EPSG:3111]')
         self.assertEqual(m.data(m.index(2, 0), Qt.DisplayRole), 'l2 [EPSG:3111]')
+        self.assertEqual(m.data(m.index(3, 0), Qt.DisplayRole), 'no geom')
 
         m.setAdditionalItems(['a'])
-        self.assertEqual(m.data(m.index(3, 0), Qt.DisplayRole), 'a')
+        self.assertEqual(m.data(m.index(4, 0), Qt.DisplayRole), 'a')
 
-        QgsProject.instance().removeMapLayers([l1.id(), l2.id()])
+        QgsProject.instance().removeMapLayers([l1.id(), l2.id(), l3.id()])
 
     def testLayerIdRole(self):
         l1 = create_layer('l1')