getProjectSettings response: return 'maptip' instead of tooltip template as

jef-n · jef-n · commit 50d2a7495b2e · 2014-11-22T22:08:17.000+01:00
displayField layer attribute
diff --git a/src/mapserver/qgsserverprojectparser.cpp b/src/mapserver/qgsserverprojectparser.cpp
@@ -625,7 +625,8 @@ void QgsServerProjectParser::addLayerProjectSettings( QDomElement& layerElem, QD
   {
     QgsVectorLayer* vLayer = static_cast<QgsVectorLayer*>( currentLayer );
     const QSet<QString>& excludedAttributes = vLayer->excludeAttributesWMS();
-    QString displayField = vLayer->displayField();
+    int displayFieldIdx = vLayer->fieldNameIndex( vLayer->displayField() );
+    QString displayField = displayFieldIdx < 0 ? "maptip" : vLayer->displayField();
 
     //attributes
     QDomElement attributesElem = doc.createElement( "Attributes" );
@@ -638,7 +639,7 @@ void QgsServerProjectParser::addLayerProjectSettings( QDomElement& layerElem, QD
         continue;
       }
       // field alias in case of displayField
-      if ( field.name() == displayField )
+      if ( idx == displayFieldIdx )
       {
         displayField = vLayer->attributeDisplayName( idx );
       }

Original file line number	Diff line number	Diff line change
`@@ -625,7 +625,8 @@ void QgsServerProjectParser::addLayerProjectSettings( QDomElement& layerElem, QD`
`625`	`625`	`{`
`626`	`626`	`QgsVectorLayer* vLayer = static_cast<QgsVectorLayer*>( currentLayer );`
`627`	`627`	`const QSet<QString>& excludedAttributes = vLayer->excludeAttributesWMS();`
`628`		`- QString displayField = vLayer->displayField();`
	`628`	`+ int displayFieldIdx = vLayer->fieldNameIndex( vLayer->displayField() );`
	`629`	`+ QString displayField = displayFieldIdx < 0 ? "maptip" : vLayer->displayField();`
`629`	`630`
`630`	`631`	`//attributes`
`631`	`632`	`QDomElement attributesElem = doc.createElement( "Attributes" );`
`@@ -638,7 +639,7 @@ void QgsServerProjectParser::addLayerProjectSettings( QDomElement& layerElem, QD`
`638`	`639`	`continue;`
`639`	`640`	`}`
`640`	`641`	`// field alias in case of displayField`
`641`		`- if ( field.name() == displayField )`
	`642`	`+ if ( idx == displayFieldIdx )`
`642`	`643`	`{`
`643`	`644`	`displayField = vLayer->attributeDisplayName( idx );`
`644`	`645`	`}`