Merge pull request #5697 from pblottiere/server_bugfix_getprojectsett…

…ings [server][bugfix] Fixes #17519 by fixing GetProjectSettings response
qgis · Nov 27, 2017 · d147064 · d147064
2 parents 9bfb3f3 + 4aa97d8
commit d147064
Show file tree

Hide file tree

Showing 3 changed files with 333 additions and 322 deletions.
diff --git a/src/server/services/wms/qgswmsgetcapabilities.cpp b/src/server/services/wms/qgswmsgetcapabilities.cpp
@@ -653,7 +653,7 @@ namespace QgsWms
         const QgsComposerMap *composerMap = *cmIt;
 
         QDomElement composerMapElem = doc.createElement( QStringLiteral( "ComposerMap" ) );
-        composerMapElem.setAttribute( QStringLiteral( "name" ), QStringLiteral( "map%s" ).arg( composerMap->id() ) );
+        composerMapElem.setAttribute( QStringLiteral( "name" ), QStringLiteral( "map%1" ).arg( composerMap->id() ) );
         composerMapElem.setAttribute( QStringLiteral( "width" ), composerMap->rect().width() );
         composerMapElem.setAttribute( QStringLiteral( "height" ), composerMap->rect().height() );
         composerTemplateElem.appendChild( composerMapElem );

diff --git a/tests/testdata/qgis_server/getprojectsettings.txt b/tests/testdata/qgis_server/getprojectsettings.txt
@@ -110,6 +110,12 @@ Content-Type: text/xml; charset=utf-8
    <Format>XML</Format>
   </Exception>
   <sld:UserDefinedSymbolization SupportSLD="1" RemoteWCS="0" UserLayer="0" InlineFeature="0" RemoteWFS="0" UserStyle="1"/>
+  <ComposerTemplates>
+   <ComposerTemplate height="210" width="297" name="mytemplate">
+    <ComposerMap height="26" width="61" name="map1"/>
+    <ComposerMap height="103" width="87" name="map0"/>
+   </ComposerTemplate>
+  </ComposerTemplates>
   <WFSLayers>
    <WFSLayer name="testlayer èé"/>
   </WFSLayers>