Fix #13919, don't reset layer subsetStrings when server python plugins

are enabled
qgis · Feb 22, 2016 · 90a4ae8 · 90a4ae8 · sbrunner · Feb 22, 2016
1 parent ba7dc0d
commit 90a4ae8
Showing 1 changed file with 13 additions and 17 deletions.
diff --git a/src/server/qgsowsserver.cpp b/src/server/qgsowsserver.cpp
@@ -28,26 +28,22 @@ void QgsOWSServer::applyAccessControlLayerFilters( QgsMapLayer* mapLayer, QMap<Q
 {
   if ( QgsVectorLayer* layer = dynamic_cast<QgsVectorLayer*>( mapLayer ) )
   {
-    if ( layer->setSubsetString( "" ) )
+    QString sql = mAccessControl->extraSubsetString( layer );
+    if ( !sql.isEmpty() )
     {
-      QString sql = mAccessControl->extraSubsetString( layer );
+      if ( !originalLayerFilters.contains( layer->id() ) )
-      if ( !sql.isEmpty() )
       {
-        if ( !originalLayerFilters.contains( layer->id() ) )
+        originalLayerFilters.insert( layer->id(), layer->subsetString() );
-        {
+      }
-          originalLayerFilters.insert( layer->id(), layer->subsetString() );
+      if ( !layer->subsetString().isEmpty() )
-        }
+      {
-        if ( !layer->subsetString().isEmpty() )
+        sql.prepend( " AND " );
-        {
+        sql.prepend( layer->subsetString() );
-          sql.prepend( " AND " );
+      }
-          sql.prepend( layer->subsetString() );
+      if ( !layer->setSubsetString( sql ) )
-        }
+      {
-        layer->setSubsetString( sql );
+        QgsMessageLog::logMessage( "Layer does not support Subset String" );
       }
-    }
-    else
-    {
-      QgsMessageLog::logMessage( "Layer does not support Subset String" );
     }
   }
 }