Skip to content
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.

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

[attribute form] Insure that a field features multiple times in a feature form has its constraint properly reflected #56163

Merged
merged 2 commits into from
Feb 6, 2024

Conversation

nirvn
Copy link
Contributor

@nirvn nirvn commented Feb 3, 2024

Description

This PR fixes #55607 , whereas a feature form featuring the same field editor widget multiple times would not have their constraints properly reflected in the UI.

@github-actions github-actions bot added this to the 3.36.0 milestone Feb 3, 2024
Copy link

github-actions bot commented Feb 3, 2024

🪟 Windows builds ready!

Windows builds of this PR are available for testing here. Debug symbols for this build are available here.

(Built from commit 55fb32e)

…ture form has its constraint properly reflected
Co-authored-by: Even Rouault <even.rouault@spatialys.com>
Copy link
Member

@3nids 3nids left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice!

@nirvn nirvn merged commit b6c7889 into qgis:master Feb 6, 2024
31 checks passed
@qgis-bot
Copy link
Collaborator

qgis-bot commented Feb 6, 2024

The backport to release-3_34 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 9f3df359246... [attribute form] Insure that a field features multiple times in a feature form has its constraint properly reflected
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

stdout
CONFLICT (modify/delete): python/PyQt6/gui/auto_generated/editorwidgets/core/qgseditorwidgetwrapper.sip.in deleted in HEAD and modified in 9f3df359246 ([attribute form] Insure that a field features multiple times in a feature form has its constraint properly reflected).  Version 9f3df359246 ([attribute form] Insure that a field features multiple times in a feature form has its constraint properly reflected) of python/PyQt6/gui/auto_generated/editorwidgets/core/qgseditorwidgetwrapper.sip.in left in tree.

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release-3_34 release-3_34
# Navigate to the new working tree
cd .worktrees/backport-release-3_34
# Create a new branch
git switch --create backport-56163-to-release-3_34
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 9f3df3592466ac2163eeeab2d2770fdb2b1fb94f,55fb32e9ed6bd627ab3e9a917b33a9623d0ec25e
# Push it to GitHub
git push --set-upstream origin backport-56163-to-release-3_34
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-3_34

Then, create a pull request where the base branch is release-3_34 and the compare/head branch is backport-56163-to-release-3_34.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release-3_34 failed backport The automated backport attempt failed, needs a manual backport
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Constraints are not behaving on range widget correctly when a field is displayed twice in a form
5 participants