[BUGFIX][QGIS Server] Joins was not reloaded if the layer is in cache

rldhont · rldhont · commit ad32b5e1a7aa · 2016-10-07T15:41:38.000+02:00
With the commit f6aad8b, the QgsMapLayerRegistry signal `layersWillBeRemoved` is always emit. This imply that the vector layer join buffer is empty and not reloaded if the layer is in cache. To fix it, the layer XML element has to be read each time the layer is used. This commit fixed #15522 Qgis Server doesnt' respect the styling from Desktop
diff --git a/src/server/qgsserverprojectparser.cpp b/src/server/qgsserverprojectparser.cpp
@@ -28,6 +28,9 @@
 #include "qgseditorwidgetregistry.h"
 #include "qgslayertreegroup.h"
 
+#include "qgslogger.h"
+#include "qgsmessagelog.h"
+
 #include <QDomDocument>
 #include <QFileInfo>
 #include <QStringList>
@@ -234,8 +237,11 @@ QgsMapLayer* QgsServerProjectParser::createLayerFromElement( const QDomElement&
     if ( !QgsMapLayerRegistry::instance()->mapLayer( id ) )
       QgsMapLayerRegistry::instance()->addMapLayer( layer, false, false );
     if ( layer->type() == QgsMapLayer::VectorLayer )
+    {
       addValueRelationLayersForLayer( dynamic_cast<QgsVectorLayer *>( layer ) );
-
+      // Reload joins and expression fields
+      layer->readLayerXML( const_cast<QDomElement&>( elem ) );
+    }
     return layer;
   }
 
@@ -1535,7 +1541,7 @@ void QgsServerProjectParser::addJoinLayersForElement( const QDomElement& layerEl
   {
     QString id = joinNodeList.at( i ).toElement().attribute( "joinLayerId" );
     QgsMapLayer* layer = mapLayerFromLayerId( id );
-    if ( layer )
+    if ( layer && !QgsMapLayerRegistry::instance()->mapLayer( id ))
     {
       QgsMapLayerRegistry::instance()->addMapLayer( layer, false, false );
     }
