Skip to content

Add condition so readOnly child cannot be added from parent #4688

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
xkello wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add condition so readOnly child cannot be added from parent #4688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fceda45
Add condition so readOnly child cannot be added from parent
xkello Aug 28, 2026
f1b7110
Fix some relation issues
xkello Sep 9, 2026
e91c6e2
Merge remote-tracking branch 'origin/master' into bugfix/remove-add-b…
xkello Sep 9, 2026
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
2 changes: 1 addition & 1 deletion app/qml/form/editors/MMFormGalleryEditor.qml
View file
Open in desktop
Comment thread
xkello marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ MMPrivateComponents.MMBaseInput {
}
}

header: __activeProject.projectRole !== "reader" ? addFeatureComponent : null
header: (__activeProject.projectRole !== "reader" && !rmodel?.layer?.readOnly) ? addFeatureComponent : null
}

Component {
Expand Down
2 changes: 1 addition & 1 deletion app/qml/form/editors/MMFormRelationEditor.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ MMPrivateComponents.MMBaseInput {
height: privates.itemHeight
radius: 8 * __dp
color: __style.lightGreenColor
visible: __activeProject.projectRole !== "reader"
visible: (__activeProject.projectRole !== "reader" && !rmodel?.layer?.readOnly)

MMComponents.MMIcon {
anchors.centerIn: parent
Expand Down
9 changes: 5 additions & 4 deletions app/relationfeaturesmodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,10 @@ void RelationFeaturesModel::setParentFeatureLayerPair( FeatureLayerPair pair )

if ( !InputUtils::isFeatureIdValid( pair.feature().id() ) )
{
//
// Clear the model in case parent feature has invalid id (e.g. is new) and do not populate it
//
// Parent has no valid id yet (e.g. new feature) - clear features but keep mLayer known.

beginResetModel();
reset();
mFeatures.clear();
endResetModel();
}
else
Expand All @@ -96,6 +94,9 @@ void RelationFeaturesModel::setRelation( QgsRelation relation )
mRelation = relation;
emit relationChanged( mRelation );

// set layer early so it's known even before the parent feature has a valid id (e.g. new feature)
LayerFeaturesModel::setLayer( mRelation.isValid() ? mRelation.referencingLayer() : nullptr );

setup();
}
}
Expand Down
Loading