Skip to content

Commit b823874

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 a13ef7b commit b823874

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
@@ -1189,6 +1189,27 @@ QSet<QString> QgsServerProjectParser::findRestrictedLayers() const
11891189
}
11901190
}
11911191
}
1192+
// Add short name in restricted layers
1193+
else
1194+
{
1195+
QDomNodeList layerNodeList = mXMLDoc->elementsByTagName( "maplayer" );
1196+
for ( int i = 0; i < layerNodeList.size(); ++i )
1197+
{
1198+
QDomElement layerElem = layerNodeList.at( i ).toElement();
1199+
// get name
1200+
QString lName = layerName( layerElem );
1201+
if ( restrictedLayerSet.contains( lName ) )
1202+
{
1203+
// get short name
1204+
lName = layerShortName( layerElem );
1205+
if ( !lName.isEmpty() )
1206+
{
1207+
// add short name
1208+
restrictedLayerSet.insert( lName );
1209+
}
1210+
}
1211+
}
1212+
}
11921213
return restrictedLayerSet;
11931214
}
11941215

0 commit comments

Comments
 (0)