qgis · Aug 8, 2018
diff --git a/‎src/server/services/wms/qgswmsrenderer.cpp
Lines changed: 18 additions & 16 deletions b/‎src/server/services/wms/qgswmsrenderer.cpp
Lines changed: 18 additions & 16 deletions
@@ -330,18 +330,16 @@ namespace QgsWms
     bool updateMapExtent = mWmsParameters.bbox().isEmpty();
     Q_FOREACH ( QgsMapLayer *layer, layers )
     {
+      checkLayerReadPermissions( layer );
+
       Q_FOREACH ( QgsWmsParametersLayer param, params )
       {
         if ( param.mNickname == layerNickname( *layer ) )
         {
-          checkLayerReadPermissions( layer );
-
           setLayerOpacity( layer, param.mOpacity );
 
           setLayerFilter( layer, param.mFilter );
 
-          setLayerAccessControlFilter( layer );
-
           setLayerSelection( layer, param.mSelection );
 
           if ( updateMapExtent )
@@ -350,6 +348,8 @@ namespace QgsWms
           break;
         }
       }
+
+      setLayerAccessControlFilter( layer );
     }
 
     // add highlight layers above others
@@ -679,18 +679,16 @@ namespace QgsWms
     bool updateMapExtent = mWmsParameters.bbox().isEmpty();
     Q_FOREACH ( QgsMapLayer *layer, layers )
     {
+      checkLayerReadPermissions( layer );
+
       Q_FOREACH ( QgsWmsParametersLayer param, params )
       {
         if ( param.mNickname == layerNickname( *layer ) )
         {
-          checkLayerReadPermissions( layer );
-
           setLayerOpacity( layer, param.mOpacity );
 
           setLayerFilter( layer, param.mFilter );
 
-          setLayerAccessControlFilter( layer );
-
           setLayerSelection( layer, param.mSelection );
 
           if ( updateMapExtent )
@@ -699,6 +697,8 @@ namespace QgsWms
           break;
         }
       }
+
+      setLayerAccessControlFilter( layer );
     }
 
     // add highlight layers above others
@@ -781,21 +781,23 @@ namespace QgsWms
         continue;
       if ( !wfsLayerIds.contains( layer->id() ) )
         continue;
+
+      checkLayerReadPermissions( layer );
+
       Q_FOREACH ( QgsWmsParametersLayer param, params )
       {
         if ( param.mNickname == layerNickname( *layer ) )
         {
-          checkLayerReadPermissions( layer );
-
           setLayerOpacity( layer, param.mOpacity );
 
           setLayerFilter( layer, param.mFilter );
 
-          setLayerAccessControlFilter( layer );
-
           break;
         }
       }
+
+      setLayerAccessControlFilter( layer );
+
       // cast for dxf layers
       QgsVectorLayer *vlayer = static_cast<QgsVectorLayer *>( layer );
 
@@ -951,19 +953,19 @@ namespace QgsWms
 
     Q_FOREACH ( QgsMapLayer *layer, layers )
     {
+      checkLayerReadPermissions( layer );
+
       Q_FOREACH ( QgsWmsParametersLayer param, params )
       {
         if ( param.mNickname == layerNickname( *layer ) )
         {
-          checkLayerReadPermissions( layer );
-
           setLayerFilter( layer, param.mFilter );
 
-          setLayerAccessControlFilter( layer );
-
           break;
         }
       }
+
+      setLayerAccessControlFilter( layer );
     }
 
     // add layers to map settings (revert order for the rendering)
Original file line number	Diff line number	Diff line change
`@@ -330,18 +330,16 @@ namespace QgsWms`
`330`	`330`	`bool updateMapExtent = mWmsParameters.bbox().isEmpty();`
`331`	`331`	`Q_FOREACH ( QgsMapLayer *layer, layers )`
`332`	`332`	`{`
	`333`	`+ checkLayerReadPermissions( layer );`
	`334`	`+`
`333`	`335`	`Q_FOREACH ( QgsWmsParametersLayer param, params )`
`334`	`336`	`{`
`335`	`337`	`if ( param.mNickname == layerNickname( *layer ) )`
`336`	`338`	`{`
`337`		`- checkLayerReadPermissions( layer );`
`338`		`-`
`339`	`339`	`setLayerOpacity( layer, param.mOpacity );`
`340`	`340`
`341`	`341`	`setLayerFilter( layer, param.mFilter );`
`342`	`342`
`343`		`- setLayerAccessControlFilter( layer );`
`344`		`-`
`345`	`343`	`setLayerSelection( layer, param.mSelection );`
`346`	`344`
`347`	`345`	`if ( updateMapExtent )`
`@@ -350,6 +348,8 @@ namespace QgsWms`
`350`	`348`	`break;`
`351`	`349`	`}`
`352`	`350`	`}`
	`351`	`+`
	`352`	`+ setLayerAccessControlFilter( layer );`
`353`	`353`	`}`
`354`	`354`
`355`	`355`	`// add highlight layers above others`
`@@ -679,18 +679,16 @@ namespace QgsWms`
`679`	`679`	`bool updateMapExtent = mWmsParameters.bbox().isEmpty();`
`680`	`680`	`Q_FOREACH ( QgsMapLayer *layer, layers )`
`681`	`681`	`{`
	`682`	`+ checkLayerReadPermissions( layer );`
	`683`	`+`
`682`	`684`	`Q_FOREACH ( QgsWmsParametersLayer param, params )`
`683`	`685`	`{`
`684`	`686`	`if ( param.mNickname == layerNickname( *layer ) )`
`685`	`687`	`{`
`686`		`- checkLayerReadPermissions( layer );`
`687`		`-`
`688`	`688`	`setLayerOpacity( layer, param.mOpacity );`
`689`	`689`
`690`	`690`	`setLayerFilter( layer, param.mFilter );`
`691`	`691`
`692`		`- setLayerAccessControlFilter( layer );`
`693`		`-`
`694`	`692`	`setLayerSelection( layer, param.mSelection );`
`695`	`693`
`696`	`694`	`if ( updateMapExtent )`
`@@ -699,6 +697,8 @@ namespace QgsWms`
`699`	`697`	`break;`
`700`	`698`	`}`
`701`	`699`	`}`
	`700`	`+`
	`701`	`+ setLayerAccessControlFilter( layer );`
`702`	`702`	`}`
`703`	`703`
`704`	`704`	`// add highlight layers above others`
`@@ -781,21 +781,23 @@ namespace QgsWms`
`781`	`781`	`continue;`
`782`	`782`	`if ( !wfsLayerIds.contains( layer->id() ) )`
`783`	`783`	`continue;`
	`784`	`+`
	`785`	`+ checkLayerReadPermissions( layer );`
	`786`	`+`
`784`	`787`	`Q_FOREACH ( QgsWmsParametersLayer param, params )`
`785`	`788`	`{`
`786`	`789`	`if ( param.mNickname == layerNickname( *layer ) )`
`787`	`790`	`{`
`788`		`- checkLayerReadPermissions( layer );`
`789`		`-`
`790`	`791`	`setLayerOpacity( layer, param.mOpacity );`
`791`	`792`
`792`	`793`	`setLayerFilter( layer, param.mFilter );`
`793`	`794`
`794`		`- setLayerAccessControlFilter( layer );`
`795`		`-`
`796`	`795`	`break;`
`797`	`796`	`}`
`798`	`797`	`}`
	`798`	`+`
	`799`	`+ setLayerAccessControlFilter( layer );`
	`800`	`+`
`799`	`801`	`// cast for dxf layers`
`800`	`802`	`QgsVectorLayer vlayer = static_cast<QgsVectorLayer >( layer );`
`801`	`803`
`@@ -951,19 +953,19 @@ namespace QgsWms`
`951`	`953`
`952`	`954`	`Q_FOREACH ( QgsMapLayer *layer, layers )`
`953`	`955`	`{`
	`956`	`+ checkLayerReadPermissions( layer );`
	`957`	`+`
`954`	`958`	`Q_FOREACH ( QgsWmsParametersLayer param, params )`
`955`	`959`	`{`
`956`	`960`	`if ( param.mNickname == layerNickname( *layer ) )`
`957`	`961`	`{`
`958`		`- checkLayerReadPermissions( layer );`
`959`		`-`
`960`	`962`	`setLayerFilter( layer, param.mFilter );`
`961`	`963`
`962`		`- setLayerAccessControlFilter( layer );`
`963`		`-`
`964`	`964`	`break;`
`965`	`965`	`}`
`966`	`966`	`}`
	`967`	`+`
	`968`	`+ setLayerAccessControlFilter( layer );`
`967`	`969`	`}`
`968`	`970`
`969`	`971`	`// add layers to map settings (revert order for the rendering)`