Skip to content

Commit 23b0d44

Browse files
committed
[BUGFIX][Server] Add short names in restricted layer list
The restricted layer list contains layer names and layer ids if layer ids are used as service layer name. This code adds layer short name to the restricted layer list if layer ids are not used as service layer name.
1 parent ff442c4 commit 23b0d44

File tree

1 file changed

+21
-0
lines changed

1 file changed

+21
-0
lines changed

src/server/qgsserverprojectparser.cpp

+21
Original file line numberDiff line numberDiff line change
@@ -1173,6 +1173,27 @@ QSet<QString> QgsServerProjectParser::findRestrictedLayers() const
11731173
}
11741174
}
11751175
}
1176+
// Add short name in restricted layers
1177+
else
1178+
{
1179+
QDomNodeList layerNodeList = mXMLDoc->elementsByTagName( "maplayer" );
1180+
for ( int i = 0; i < layerNodeList.size(); ++i )
1181+
{
1182+
QDomElement layerElem = layerNodeList.at( i ).toElement();
1183+
// get name
1184+
QString lName = layerName( layerElem );
1185+
if ( restrictedLayerSet.contains( lName ) )
1186+
{
1187+
// get short name
1188+
lName = layerShortName( layerElem );
1189+
if ( !lName.isEmpty() )
1190+
{
1191+
// add short name
1192+
restrictedLayerSet.insert( lName );
1193+
}
1194+
}
1195+
}
1196+
}
11761197
return restrictedLayerSet;
11771198
}
11781199

0 commit comments

Comments
 (0)