Skip to content

Commit 89dd263

Browse files
committed
Revert "[BUGFIX][QGIS Server] Joins was not reloaded if the layer is in cache"
This reverts commit ad32b5e.
1 parent c2328b1 commit 89dd263

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

src/server/qgsserverprojectparser.cpp

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@
2828
#include "qgseditorwidgetregistry.h"
2929
#include "qgslayertreegroup.h"
3030

31-
#include "qgslogger.h"
32-
#include "qgsmessagelog.h"
33-
3431
#include <QDomDocument>
3532
#include <QFileInfo>
3633
#include <QStringList>
@@ -237,11 +234,8 @@ QgsMapLayer* QgsServerProjectParser::createLayerFromElement( const QDomElement&
237234
if ( !QgsMapLayerRegistry::instance()->mapLayer( id ) )
238235
QgsMapLayerRegistry::instance()->addMapLayer( layer, false, false );
239236
if ( layer->type() == QgsMapLayer::VectorLayer )
240-
{
241237
addValueRelationLayersForLayer( dynamic_cast<QgsVectorLayer *>( layer ) );
242-
// Reload joins and expression fields
243-
layer->readLayerXML( const_cast<QDomElement&>( elem ) );
244-
}
238+
245239
return layer;
246240
}
247241

@@ -1541,7 +1535,7 @@ void QgsServerProjectParser::addJoinLayersForElement( const QDomElement& layerEl
15411535
{
15421536
QString id = joinNodeList.at( i ).toElement().attribute( "joinLayerId" );
15431537
QgsMapLayer* layer = mapLayerFromLayerId( id );
1544-
if ( layer && !QgsMapLayerRegistry::instance()->mapLayer( id ))
1538+
if ( layer )
15451539
{
15461540
QgsMapLayerRegistry::instance()->addMapLayer( layer, false, false );
15471541
}

0 commit comments

Comments
 (0)