correctly set feature request, prefix now set to 'af'

qgis · Sep 7, 2018 · 53c3150 · 53c3150
1 parent 2aa280e
commit 53c3150
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/app/locator/qgsinbuiltlocatorfilters.cpp b/src/app/locator/qgsinbuiltlocatorfilters.cpp
@@ -335,7 +335,9 @@ void QgsAllLayersFeaturesLocatorFilter::prepare( const QString &string, const Qg
     expression.prepare( &context );
 
     QgsFeatureRequest req;
-    req.setFlags( QgsFeatureRequest::NoGeometry );
+    req.setSubsetOfAttributes( expression.referencedAttributeIndexes( layer->fields() ).toList() );
+    if ( !expression.needsGeometry() )
+      req.setFlags( QgsFeatureRequest::NoGeometry );
     req.setFilterExpression( QStringLiteral( "%1 ILIKE '%%2%'" )
                              .arg( layer->displayExpression() )
                              .arg( string ) );

diff --git a/src/app/locator/qgsinbuiltlocatorfilters.h b/src/app/locator/qgsinbuiltlocatorfilters.h
@@ -134,7 +134,7 @@ class QgsAllLayersFeaturesLocatorFilter : public QgsLocatorFilter
     QString name() const override { return QStringLiteral( "allfeatures" ); }
     QString displayName() const override { return tr( "Features In All Layers" ); }
     Priority priority() const override { return Medium; }
-    QString prefix() const override { return QStringLiteral( "a" ); }
+    QString prefix() const override { return QStringLiteral( "af" ); }
 
     void prepare( const QString &string, const QgsLocatorContext &context ) override;
     void fetchResults( const QString &string, const QgsLocatorContext &context, QgsFeedback *feedback ) override;