Skip to content

Fix handling of current_parent* driven default value expression when editing a child feature #7682

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

Open
nirvn wants to merge 1 commit into
base: master
Choose a base branch
from
+22 −31
Open

Fix handling of current_parent* driven default value expression when editing a child feature #7682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions src/core/attributeformmodelbase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,9 +311,11 @@ void AttributeFormModelBase::applyParentDefaultValues()
if ( !fields.at( fidx ).defaultValueDefinition().isValid() || ( !fields.at( fidx ).defaultValueDefinition().applyOnUpdate() && !featureIsNew ) )
continue;

if ( fields.at( fidx ).defaultValueDefinition().expression().indexOf( "@current_parent_" ) > -1 )
QgsExpression exp( fields.at( fidx ).defaultValueDefinition().expression() );
const QSet<QString> referencedFunctions = exp.referencedFunctions();
const QSet<QString> referencedVariables = exp.referencedVariables();
if ( referencedFunctions.contains( QStringLiteral( "current_parent_value" ) ) || referencedVariables.contains( QStringLiteral( "current_parent_feature" ) ) || referencedVariables.contains( QStringLiteral( "current_parent_geometry" ) ) )
{
QgsExpression exp( fields.at( fidx ).defaultValueDefinition().expression() );
exp.prepare( &mExpressionContext );
const QVariant defaultValue = exp.evaluate( &mExpressionContext );
const bool success = mFeatureModel->setData( mFeatureModel->index( fidx ), defaultValue, FeatureModel::AttributeValue );
Expand Down
22 changes: 15 additions & 7 deletions src/qml/editorwidgets/RelationEditorBase.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,13 +290,7 @@ EditorWidgetBase {

text: qsTr("Open Form")
onTriggered: {
ensureEmbeddedFormLoaded();
embeddedPopup.state = isEnabled ? 'Edit' : 'ReadOnly';
embeddedPopup.currentLayer = nmRelationId ? relationEditorModel.nmRelation.referencedLayer : relationEditorModel.relation.referencingLayer;
embeddedPopup.linkedRelation = relationEditorModel.relation;
embeddedPopup.linkedParentFeature = relationEditorModel.feature;
embeddedPopup.feature = nmRelationId ? childMenu.entryNmReferencedFeature : childMenu.entryReferencingFeature;
embeddedPopup.open();
showViewFeaturePopup(nmRelationId ? childMenu.entryNmReferencedFeature : childMenu.entryReferencingFeature);
}
}

Expand Down Expand Up @@ -459,6 +453,20 @@ EditorWidgetBase {
showAddFeaturePopup(geometry);
}

function showViewFeaturePopup(feature) {
ensureEmbeddedFormLoaded();
embeddedPopup.state = isEnabled ? 'Edit' : 'ReadOnly';
embeddedPopup.currentLayer = nmRelationId ? relationEditorModel.nmRelation.referencedLayer : relationEditorModel.relation.referencingLayer;
embeddedPopup.linkedParentFeature = relationEditorModel.feature;
embeddedPopup.linkedRelation = relationEditorModel.relation;
embeddedPopup.linkedRelationOrderingField = relationEditorModel.orderingField !== undefined ? relationEditorModel.orderingField : "";
embeddedPopup.feature = feature;
embeddedPopup.open();
if (isEnabled) {
embeddedPopup.attributeFormModel.applyParentDefaultValues();
}
}

function showAddFeaturePopup(geometry) {
ensureEmbeddedFormLoaded();
embeddedPopup.state = 'Add';
Expand Down
8 changes: 1 addition & 7 deletions src/qml/editorwidgets/relationeditors/gallery_relation_editor.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,13 +489,7 @@ RelationEditorBase {

function openFeatureForm(feature, nmFeature) {
stopAllMedia();
ensureEmbeddedFormLoaded();
embeddedPopup.state = isEnabled ? 'Edit' : 'ReadOnly';
embeddedPopup.currentLayer = nmRelationId ? referencingFeatureListModel.nmRelation.referencedLayer : referencingFeatureListModel.relation.referencingLayer;
embeddedPopup.linkedRelation = referencingFeatureListModel.relation;
embeddedPopup.linkedParentFeature = referencingFeatureListModel.feature;
embeddedPopup.feature = nmRelationId ? nmFeature : feature;
embeddedPopup.open();
showViewFeaturePopup(nmRelationId ? nmFeature : feature);
}

function resolveAttachmentPath(path) {
Expand Down
9 changes: 1 addition & 8 deletions src/qml/editorwidgets/relationeditors/ordered_relation_editor.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,14 +165,7 @@ RelationEditorBase {
bgcolor: 'transparent'

onClicked: {
ensureEmbeddedFormLoaded();
embeddedPopup.state = isEnabled ? 'Edit' : 'ReadOnly';
embeddedPopup.currentLayer = orderedRelationModel.relation.referencingLayer;
embeddedPopup.linkedRelation = orderedRelationModel.relation;
embeddedPopup.linkedRelationOrderingField = orderedRelationModel.orderingField;
embeddedPopup.linkedParentFeature = orderedRelationModel.feature;
embeddedPopup.feature = model.referencingFeature;
embeddedPopup.open();
showViewFeaturePopup(model.referencingFeature);
}
}

Expand Down
8 changes: 1 addition & 7 deletions src/qml/editorwidgets/relationeditors/relation_editor.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,13 +112,7 @@ RelationEditorBase {
bgcolor: 'transparent'

onClicked: {
ensureEmbeddedFormLoaded();
embeddedPopup.state = isEnabled ? 'Edit' : 'ReadOnly';
embeddedPopup.currentLayer = nmRelationId ? referencingFeatureListModel.nmRelation.referencedLayer : referencingFeatureListModel.relation.referencingLayer;
embeddedPopup.linkedRelation = referencingFeatureListModel.relation;
embeddedPopup.linkedParentFeature = referencingFeatureListModel.feature;
embeddedPopup.feature = nmRelationId ? model.nmReferencedFeature : model.referencingFeature;
embeddedPopup.open();
showViewFeaturePopup(nmRelationId ? model.nmReferencedFeature : model.referencingFeature);
}
}

Expand Down
Loading