getProjectSettings response: return 'maptip' instead of tooltip templ…

…ate as displayField layer attribute
qgis · Nov 22, 2014 · 269b626 · 269b626
1 parent ebfa600
commit 269b626
Showing 1 changed file with 3 additions and 2 deletions.
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 );
       }