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

Fixes #59059

Merged
merged 2 commits into from
Oct 13, 2024
Merged

Fixes #59059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d4cc6a
translation string fixes
jef-n Oct 11, 2024
6919820
debian packaging: include gui binding additions
jef-n Oct 11, 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
1 change: 1 addition & 0 deletions debian/python3-qgis-common.install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ usr/lib/python*/*-packages/qgis/*.py*
usr/lib/python*/*-packages/qgis/PyQt/*
usr/lib/python*/*-packages/qgis/processing/*
usr/lib/python*/*-packages/qgis/testing/*
usr/lib/python*/*-packages/qgis/gui/additions/*
usr/lib/python*/*-packages/qgis/core/additions/*
usr/lib/python*/*-packages/qgis/core/contextmanagers.py
usr/lib/python*/*-packages/qgis/*/*.yaml
Expand Down
16 changes: 8 additions & 8 deletions src/core/auth/qgsauthconfigurationstoragedb.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ bool QgsAuthConfigurationStorageDb::authDbQuery( QSqlQuery *query, const QString
const QStringList keys = query->boundValueNames();
const QVariantList values = query->boundValues();
QMap<QString, QVariant> boundValues;
for ( int i=0; i<keys.count(); i++)
for ( int i = 0; i < keys.count(); i++ )
{
boundValues.insert( keys.at( i ), values.at( i ).toString() );
}
Expand Down Expand Up @@ -267,7 +267,7 @@ QList<QgsAuthConfigurationStorage::SettingParameter> QgsAuthConfigurationStorage
{
return
{
{ QStringLiteral( "driver" ), tr( "SQL Driver (see https://doc.qt.io/qt-6/sql-driver.html)" ), QVariant::String },
{ QStringLiteral( "driver" ), tr( "SQL Driver (see https://doc.qt.io/qt/sql-driver.html)" ), QVariant::String },
{ QStringLiteral( "database" ), tr( "Database" ), QVariant::String },
{ QStringLiteral( "schema" ), tr( "Schema for all tables" ), QVariant::String },
{ QStringLiteral( "host" ), tr( "Host" ), QVariant::String },
Expand Down Expand Up @@ -448,7 +448,7 @@ const QPair<QSslCertificate, QString> QgsAuthConfigurationStorageDb::loadCertIde
}
if ( query.next() )
{
const_cast< QgsAuthConfigurationStorageDb * >( this )->setError( tr( "Select contains more than one certificate identity for id: %1" ).arg( id ), Qgis::MessageLevel::Warning );
const_cast< QgsAuthConfigurationStorageDb * >( this )->setError( tr( "Retrieved more than one certificate identity for id: %1" ).arg( id ), Qgis::MessageLevel::Warning );
return bundle;
}
bundle = qMakePair( cert, key );
Expand Down Expand Up @@ -715,7 +715,7 @@ const QgsAuthConfigSslServer QgsAuthConfigurationStorageDb::loadSslCertCustomCon
}
if ( query.next() )
{
const_cast< QgsAuthConfigurationStorageDb * >( this )->setError( tr( "Select contains more than one SSL cert custom config for id: %1" ).arg( id ), Qgis::MessageLevel::Warning );
const_cast< QgsAuthConfigurationStorageDb * >( this )->setError( tr( "Retrieved more than one SSL cert custom config for id: %1" ).arg( id ), Qgis::MessageLevel::Warning );
return QgsAuthConfigSslServer();
}
}
Expand Down Expand Up @@ -838,7 +838,7 @@ bool QgsAuthConfigurationStorageDb::sslCertCustomConfigExists( const QString &id
}
if ( query.next() )
{
QgsDebugError( QStringLiteral( "Select contains more than one SSL cert custom config for host:port, id: %1, %2" ).arg( hostport, id ) );
QgsDebugError( QStringLiteral( "Retrieved more than one SSL cert custom config for host:port, id: %1, %2" ).arg( hostport, id ) );
emit messageLog( tr( "Authentication database contains more than one SSL cert custom configs for host:port, id: %1, %2" )
.arg( hostport, id ), loggerTag(), Qgis::MessageLevel::Warning );
return false;
Expand Down Expand Up @@ -1003,7 +1003,7 @@ const QSslCertificate QgsAuthConfigurationStorageDb::loadCertAuthority( const QS
}
if ( query.next() )
{
const_cast< QgsAuthConfigurationStorageDb * >( this )->setError( tr( "Select contains more than one certificate authority for id: %1" ).arg( id ), Qgis::MessageLevel::Warning );
const_cast< QgsAuthConfigurationStorageDb * >( this )->setError( tr( "Retrieved more than one certificate authority for id: %1" ).arg( id ), Qgis::MessageLevel::Warning );
return emptycert;
}
}
Expand Down Expand Up @@ -1048,7 +1048,7 @@ bool QgsAuthConfigurationStorageDb::certAuthorityExists( const QSslCertificate &
}
if ( query.next() )
{
const_cast< QgsAuthConfigurationStorageDb * >( this )->setError( tr( "Select contains more than one certificate authority for id: %1" ).arg( id ), Qgis::MessageLevel::Warning );
const_cast< QgsAuthConfigurationStorageDb * >( this )->setError( tr( "Retrieved more than one certificate authority for id: %1" ).arg( id ), Qgis::MessageLevel::Warning );
// TODO: check whether it makes sense to return false here (and in other similar cases)
return false;
}
Expand Down Expand Up @@ -1286,7 +1286,7 @@ QgsAuthCertUtils::CertTrustPolicy QgsAuthConfigurationStorageDb::loadCertTrustPo
}
if ( query.next() )
{
const_cast< QgsAuthConfigurationStorageDb * >( this )->setError( tr( "Select contains more than one certificate trust policy for id: %1" ).arg( id ), Qgis::MessageLevel::Warning );
const_cast< QgsAuthConfigurationStorageDb * >( this )->setError( tr( "Retrieved more than one certificate trust policy for id: %1" ).arg( id ), Qgis::MessageLevel::Warning );
return QgsAuthCertUtils::DefaultTrust;
}
}
Expand Down
Loading