[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.
qgis · Jan 12, 2017 · 23b0d44 · 23b0d44
1 parent ff442c4
commit 23b0d44
Showing 1 changed file with 21 additions and 0 deletions.
diff --git a/src/server/qgsserverprojectparser.cpp b/src/server/qgsserverprojectparser.cpp
@@ -1173,6 +1173,27 @@ QSet<QString> QgsServerProjectParser::findRestrictedLayers() const
       }
     }
   }
+  // Add short name in restricted layers
+  else
+  {
+    QDomNodeList layerNodeList = mXMLDoc->elementsByTagName( "maplayer" );
+    for ( int i = 0; i < layerNodeList.size(); ++i )
+    {
+      QDomElement layerElem = layerNodeList.at( i ).toElement();
+      // get name
+      QString lName = layerName( layerElem );
+      if ( restrictedLayerSet.contains( lName ) )
+      {
+        // get short name
+        lName = layerShortName( layerElem );
+        if ( !lName.isEmpty() )
+        {
+          // add short name
+          restrictedLayerSet.insert( lName );
+        }
+      }
+    }
+  }
   return restrictedLayerSet;
 }