Get pk attributes from layer instead of provider

qgis · Jan 5, 2019 · 10cbad7769ff17cab100b521bd5e8b82307f9d65 · 10cbad7
1 parent 69de8f9
commit 10cbad7769ff17cab100b521bd5e8b82307f9d65
Unified Split

Showing with 2 additions and 8 deletions.

+2 −8 src/server/services/wms/qgswmsrenderer.cpp
diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -395,14 +395,8 @@ namespace QgsWms
         throw QgsBadRequestException( QStringLiteral( "AtlasPrintError" ),
                                       QStringLiteral( "The atlas has no coverage layer" ) );
       }
-      QgsVectorDataProvider *cProvider = cLayer->dataProvider();
-      if ( !cProvider )
-      {
-        throw QgsBadRequestException( QStringLiteral( "AtlasPrintError" ),
-                                      QStringLiteral( "An error occured during the Atlas print" ) );
-      }
 
-      QgsAttributeList pkIndexes = cProvider->pkAttributeIndexes();
+      QgsAttributeList pkIndexes = cLayer->primaryKeyAttributes();
       if ( pkIndexes.size() < 1 )
       {
         throw QgsBadRequestException( QStringLiteral( "AtlasPrintError" ),
@@ -411,7 +405,7 @@ namespace QgsWms
       QStringList pkAttributeNames;
       for ( int i = 0; i < pkIndexes.size(); ++i )
       {
-        pkAttributeNames.append( cProvider->fields()[pkIndexes.at( i )].name() );
+        pkAttributeNames.append( cLayer->fields()[pkIndexes.at( i )].name() );
       }
 
       int nAtlasFeatures = atlasPk.size() / pkIndexes.size();