Fix issue with combination of edit buffer + vector join

qgis · Jan 13, 2014 · 6d3f1b8 · 6d3f1b8
1 parent 7397bd8
commit 6d3f1b8
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/core/qgsvectorlayerfeatureiterator.cpp b/src/core/qgsvectorlayerfeatureiterator.cpp
@@ -55,12 +55,6 @@ QgsFeatureIterator QgsVectorLayerFeatureSource::getFeatures( const QgsFeatureReq
 QgsVectorLayerFeatureIterator::QgsVectorLayerFeatureIterator(QgsVectorLayerFeatureSource* source, bool ownSource, const QgsFeatureRequest& request )
   : QgsAbstractFeatureIteratorFromSource( source, ownSource, request )
 {
-  mChangedFeaturesRequest = mRequest;
-
-  if ( mSource->mHasEditBuffer )
-  {
-    mChangedFeaturesRequest.setFilterFids( mSource->mChangedAttributeValues.keys().toSet() );
-  }
 
   // prepare joins: may add more attributes to fetch (in order to allow join)
   if ( mSource->mJoinBuffer->containsJoins() )
@@ -85,6 +79,12 @@ QgsVectorLayerFeatureIterator::QgsVectorLayerFeatureIterator(QgsVectorLayerFeatu
     mProviderRequest.setSubsetOfAttributes( providerSubset );
   }
 
+  if ( mSource->mHasEditBuffer )
+  {
+    mChangedFeaturesRequest = mProviderRequest;
+    mChangedFeaturesRequest.setFilterFids( mSource->mChangedAttributeValues.keys().toSet() );
+  }
+
   if ( request.filterType() == QgsFeatureRequest::FilterFid )
   {
     mFetchedFid = false;
@@ -302,6 +302,9 @@ bool QgsVectorLayerFeatureIterator::fetchNextChangedAttributeFeature( QgsFeature
 
     updateChangedAttributes( f );
 
+    if ( !mFetchJoinInfo.isEmpty() )
+      addJoinedAttributes( f );
+
     if ( mRequest.filterType() == QgsFeatureRequest::FilterExpression )
     {
       if ( mRequest.filterExpression()->evaluate( &f ).toBool() )