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

[Bug] Add embedded layers to keyValueConfig object #4847

Merged
merged 2 commits into from
Oct 16, 2024

Conversation

mind84
Copy link
Contributor

@mind84 mind84 commented Oct 7, 2024

Embedded layers are not taken into account when Lizmap requires the the key value configuration for attribute table display.

I did a little refactoring on handling embedded layers during projects loading (it's in a separated commit, but it is strictly related to this bug)

Funded by Faunalia

@github-actions github-actions bot added this to the 3.9.0 milestone Oct 7, 2024
@mind84
Copy link
Contributor Author

mind84 commented Oct 7, 2024

Backport in 3.8, if possible.

Thanks

@Gustry
Copy link
Member

Gustry commented Oct 7, 2024

Sorry, I just renamed the project, to not only cover "editing capabilities" in #4846. Can you rebase and update the project name ?

@Gustry Gustry added run end2end If the PR must run end2end tests or not backport release_3_8 sponsored development This development has been funded labels Oct 7, 2024
@mind84 mind84 force-pushed the attribute_table_embed_keyvalue_config branch from 94c24fd to 22a0571 Compare October 7, 2024 14:10
@mind84
Copy link
Contributor Author

mind84 commented Oct 7, 2024

Can you rebase and update the project name ?

I think is good now

@Gustry Gustry modified the milestones: 3.9.0, 3.10.0 Oct 15, 2024
@rldhont rldhont merged commit 6d78baf into 3liz:master Oct 16, 2024
14 checks passed
@3liz-bot
Copy link
Contributor

The backport to release_3_8 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 22a0571b0... add embedded layers to keyValueConfig object
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 advice.mergeConflict false"

stdout
Auto-merging lizmap/modules/lizmap/lib/Project/QgisProject.php
[backport-4847-to-release_3_8 50399276d] refactoring of embedded projects referencing during projects loading
 Author: Riccardo Beltrami <riccardo.beltra@gmail.com>
 Date: Mon Oct 7 12:01:54 2024 +0200
 1 file changed, 38 insertions(+), 40 deletions(-)
Auto-merging lizmap/modules/lizmap/lib/Project/QgisProject.php
CONFLICT (content): Merge conflict in lizmap/modules/lizmap/lib/Project/QgisProject.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-4847-to-release_3_8
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 56745f1fc169566fb3e2e61e2cb4afb9d9821068,22a0571b0048e1d0ae0e520e7b7164012ac7b1a4
# Push it to GitHub
git push --set-upstream origin backport-4847-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-4847-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 failed backport 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.

4 participants