fix photo in relation preview #2058

MerginMaps · Oct 16, 2023 · 4259cf2 · 4259cf2 · inputapp-bot · Oct 16, 2023
1 parent 16cc7eb
commit 4259cf2
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/app/relationfeaturesmodel.cpp b/app/relationfeaturesmodel.cpp
@@ -112,20 +112,24 @@ QgsRelation RelationFeaturesModel::relation() const
 
 QVariant RelationFeaturesModel::relationPhotoPath( const FeatureLayerPair &featurePair ) const
 {
-  // Feature title used to get path of the referenced image.
-  QString path = featureTitle( featurePair ).toString();
-
   int fieldIndex = photoFieldIndex( featurePair.layer() );
   QgsEditorWidgetSetup setup = featurePair.layer()->editorWidgetSetup( fieldIndex );
   QVariantMap config = setup.config();
 
+  const QgsFeature feature = featurePair.feature();
+  QString path = feature.attribute( fieldIndex ).toString();
+
   QString finalPath = InputUtils::resolvePath( path, homePath(), config, featurePair, QgsProject::instance() );
 
   return QVariant( finalPath );
 }
 
 int RelationFeaturesModel::photoFieldIndex( QgsVectorLayer *layer ) const
 {
+  if ( !layer )
+  {
+    return -1;
+  }
 
   QgsFields fields = layer->fields();
   for ( int i = 0; i < fields.size(); i++ )