Merge pull request #59059 from jef-n/fixes

Fixes
qgis · Oct 13, 2024 · 3783037 · 3783037
2 parents 8191f29 + 6919820
commit 3783037
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/debian/python3-qgis-common.install b/debian/python3-qgis-common.install
@@ -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

diff --git a/src/core/auth/qgsauthconfigurationstoragedb.cpp b/src/core/auth/qgsauthconfigurationstoragedb.cpp
@@ -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() );
     }
@@ -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 },
@@ -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 );
@@ -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();
     }
   }
@@ -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;
@@ -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;
     }
   }
@@ -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;
     }
@@ -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;
     }
   }