sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #39141 from elpaso/bugfix-gh39025-fix-layer-dependency-loading

Browse Source 
Fix broken layer dependencies for old projects
This commit is contained in:
Alessandro Pasotti 2020-10-03 23:06:12 +02:00 committed by GitHub
commit beaf4307ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/app/qgisapp.cpp
View File

@ -2251,7 +2251,7 @@ const QList<QgsVectorLayerRef> QgisApp::findBrokenLayerDependencies( QgsVectorLa
if ( found ) if ( found )
{ {
// Make sure we don't add it twice // Make sure we don't add it twice if it was already added by the form widgets check
bool refFound = false; bool refFound = false;
for ( const QgsVectorLayerRef &otherRef : qgis::as_const( brokenDependencies ) ) for ( const QgsVectorLayerRef &otherRef : qgis::as_const( brokenDependencies ) )
{ {
@ -2279,6 +2279,11 @@ void QgisApp::resolveVectorLayerDependencies( QgsVectorLayer *vl, QgsMapLayer::S
const auto constDependencies { findBrokenLayerDependencies( vl, categories ) }; const auto constDependencies { findBrokenLayerDependencies( vl, categories ) };
for ( const QgsVectorLayerRef &dependency : constDependencies ) for ( const QgsVectorLayerRef &dependency : constDependencies )
{ {
// Temporary check for projects that were created before commit 7e8c7b3d0e094737336ff4834ea2af625d2921bf
if ( QgsProject::instance()->mapLayer( dependency.layerId ) )
{
continue;
}
// try to aggressively resolve the broken dependencies // try to aggressively resolve the broken dependencies
bool loaded = false; bool loaded = false;
const QString providerName { vl->dataProvider()->name() }; const QString providerName { vl->dataProvider()->name() };

7
src/core/fieldformatter/qgsrelationreferencefieldformatter.cpp
View File

@ -176,6 +176,13 @@ QVariant QgsRelationReferenceFieldFormatter::createCache( QgsVectorLayer *layer,
QList<QgsVectorLayerRef> QgsRelationReferenceFieldFormatter::layerDependencies( const QVariantMap &config ) const QList<QgsVectorLayerRef> QgsRelationReferenceFieldFormatter::layerDependencies( const QVariantMap &config ) const
{ {
// Old projects, create before the weak relations were introduced and stored with the
// widget configuration do not have the referenced layer details but only the "Relation" id,
// for these projects automatic loading of broken references is not supported.
if ( config.value( QStringLiteral( "ReferencedLayerId" ) ).toString().isEmpty() )
{
return {};
}
const QList<QgsVectorLayerRef> result {{ const QList<QgsVectorLayerRef> result {{
QgsVectorLayerRef( QgsVectorLayerRef(