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

[Fix] QGIS constraint with geometry #5462

Merged
merged 3 commits into from
Mar 3, 2025
Merged

Conversation

rldhont
Copy link
Collaborator

@rldhont rldhont commented Feb 24, 2025

The form feature's geometry was not provided for QGIS expression constraint.

Funded by Syslor

@rldhont rldhont added editing form sponsored development This development has been funded php Pull requests that update Php code expression backport release_3_8 backport release_3_9 run end2end If the PR must run end2end tests or not labels Feb 24, 2025
@github-actions github-actions bot added this to the 3.10.0 milestone Feb 24, 2025
Copy link
Member

@Gustry Gustry left a comment

Choose a reason for hiding this comment

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

LGTM, after my comment

@Gustry Gustry self-assigned this Mar 3, 2025
The form feature's geometry was not provided for QGIS expression constraint.

Funded by Syslor
@rldhont rldhont force-pushed the fix-constraint-geom branch from 56eea53 to 21ef72c Compare March 3, 2025 12:48
@rldhont
Copy link
Collaborator Author

rldhont commented Mar 3, 2025

@Gustry I have added a logMessage method.

@rldhont rldhont force-pushed the fix-constraint-geom branch from 21ef72c to 9dddef2 Compare March 3, 2025 13:01
@Gustry
Copy link
Member

Gustry commented Mar 3, 2025

You should install pre-commit https://pre-commit.com/, it makes everything easier ;-)

@rldhont rldhont force-pushed the fix-constraint-geom branch from 9dddef2 to 6176408 Compare March 3, 2025 13:35
Copy link
Member

@Gustry Gustry left a comment

Choose a reason for hiding this comment

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

Better formatting now :)
Just adding input strings between brackets, removing !

@rldhont rldhont force-pushed the fix-constraint-geom branch from 6176408 to b3a69e5 Compare March 3, 2025 14:07
@rldhont rldhont merged commit 38f24ce into 3liz:master Mar 3, 2025
19 of 20 checks passed
@3liz-bot
Copy link
Contributor

3liz-bot commented Mar 3, 2025

The backport to release_3_8 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply b3a69e538... QgisForm log message protected method.
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".
hint: Disable this message with "git config set advice.mergeConflict false"

stdout
Auto-merging lizmap/modules/lizmap/lib/Form/QgisForm.php
[backport-5462-to-release_3_8 83ad00262] [Fix] QGIS constraint with geometry
 Author: rldhont <[email protected]>
 Date: Mon Feb 24 20:33:34 2025 +0100
 1 file changed, 15 insertions(+), 1 deletion(-)
Auto-merging lizmap/modules/lizmap/lib/Form/QgisForm.php
CONFLICT (content): Merge conflict in lizmap/modules/lizmap/lib/Form/QgisForm.php
Auto-merging tests/units/classes/Form/QgisFormTest.php

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_8 release_3_8
# Navigate to the new working tree
cd .worktrees/backport-release_3_8
# Create a new branch
git switch --create backport-5462-to-release_3_8
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick b5bc93ccf5c8a9778b0648b0ecedfec10af2e234,b3a69e538e243b9a8c1a2cdfbf1884b60fa77094,0d58ac9dbf7b50b8ed1c695e24d5374b4090e771
# Push it to GitHub
git push --set-upstream origin backport-5462-to-release_3_8
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3_8

Then, create a pull request where the base branch is release_3_8 and the compare/head branch is backport-5462-to-release_3_8.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release_3_8 backport release_3_9 editing form expression failed backport php Pull requests that update Php code run end2end If the PR must run end2end tests or not sponsored development This development has been funded
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants