Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport release-3_1] Initiate expression context when gathering feature lists #4980

Merged
merged 3 commits into from
Jan 23, 2024
Merged

[Backport release-3_1] Initiate expression context when gathering feature lists #4980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
acce90c
Initiate expression context when gathering feature lists
nirvn Jan 19, 2024
151d589
Properly apply custom language locale to app
nirvn Jan 19, 2024
512c3c2
Attach needed context for filterless term searches when gathering fea…
nirvn Jan 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/app/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,6 @@ int main( int argc, char **argv )

QtWebView::initialize();

if ( !customLanguage.isEmpty() )
QgsApplication::setTranslation( customLanguage );

PlatformUtilities *platformUtils = PlatformUtilities::instance();
platformUtils->initSystem();

Expand All @@ -129,6 +126,15 @@ int main( int argc, char **argv )

QgsApplication app( argc, argv, true, profilePath, QStringLiteral( "mobile" ) );

if ( !customLanguage.isEmpty() )
{
QLocale customLocale( customLanguage );
QLocale::setDefault( customLocale );
QgsApplication::setTranslation( customLanguage );
// Set locale to emit QgsApplication's localeChanged signal
QgsApplication::setLocale( QLocale() );
}

const QString qfieldFont( qgetenv( "QFIELD_FONT_TTF" ) );
if ( !qfieldFont.isEmpty() )
{
Expand Down
34 changes: 19 additions & 15 deletions src/core/featurelistmodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,39 +262,43 @@ void FeatureListModel::gatherFeatureList()

request.setSubsetOfAttributes( referencedColumns, fields );

if ( !mFilterExpression.isEmpty()
&& ( !QgsValueRelationFieldFormatter::expressionRequiresFormScope( mFilterExpression )
|| QgsValueRelationFieldFormatter::expressionIsUsable( mFilterExpression, mCurrentFormFeature ) ) )
{
QgsExpression exp( mFilterExpression );
QgsExpressionContext filterContext = QgsExpressionContext( QgsExpressionContextUtils::globalProjectLayerScopes( mCurrentLayer ) );

if ( mCurrentFormFeature.isValid() && QgsValueRelationFieldFormatter::expressionRequiresFormScope( mFilterExpression ) )
filterContext.appendScope( QgsExpressionContextUtils::formScope( mCurrentFormFeature ) );

request.setExpressionContext( filterContext );
request.setFilterExpression( mFilterExpression );
}

QString fieldDisplayString = displayValueIndex >= 0
? QgsExpression::quotedColumnRef( mDisplayValueField )
: QStringLiteral( " ( %1 ) " ).arg( mCurrentLayer->displayExpression() );

QString searchTermExpression;
if ( !mSearchTerm.isEmpty() )
{
QString escapedSearchTerm = QgsExpression::quotedValue( mSearchTerm ).replace( QRegularExpression( QStringLiteral( "^'|'$" ) ), QString( "" ) );
QString searchTermExpression = QStringLiteral( " %1 ILIKE '%%2%' " ).arg( fieldDisplayString, escapedSearchTerm );
searchTermExpression = QStringLiteral( " %1 ILIKE '%%2%' " ).arg( fieldDisplayString, escapedSearchTerm );

const QStringList searchTermParts = escapedSearchTerm.split( QRegularExpression( QStringLiteral( "\\s+" ) ), Qt::SkipEmptyParts );
for ( const QString &searchTermPart : searchTermParts )
{
searchTermExpression += QStringLiteral( " OR %1 ILIKE '%%2%' " ).arg( fieldDisplayString, searchTermPart );
}
}

if ( !mSearchTerm.isEmpty() || !mFilterExpression.isEmpty() )
{
QgsExpressionContext filterContext = QgsExpressionContext( QgsExpressionContextUtils::globalProjectLayerScopes( mCurrentLayer ) );

if ( mCurrentFormFeature.isValid() && QgsValueRelationFieldFormatter::expressionRequiresFormScope( mFilterExpression ) )
filterContext.appendScope( QgsExpressionContextUtils::formScope( mCurrentFormFeature ) );

request.setExpressionContext( filterContext );
if ( mFilterExpression.isEmpty() )
{
request.setFilterExpression( QStringLiteral( " (%1) " ).arg( searchTermExpression ) );
}
else if ( mSearchTerm.isEmpty() )
{
request.setFilterExpression( mFilterExpression );
}
else
{
request.setFilterExpression( QStringLiteral( " (%1) AND (%2) " ).arg( mFilterExpression, searchTermExpression ) );
}
}

cleanupGatherer();
Expand Down
1 change: 1 addition & 0 deletions src/core/fieldexpressionvaluesgatherer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ class FeatureExpressionValuesGatherer : public QThread
const QStringList &identifierFields = QStringList() )
: mSource( new QgsVectorLayerFeatureSource( layer ) )
, mDisplayExpression( displayExpression.isEmpty() ? layer->displayExpression() : displayExpression )
, mExpressionContext( layer->createExpressionContext() )
, mRequest( request )
, mIdentifierFields( identifierFields )
{
Expand Down
Loading