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 export layer with accent #3853

Merged
merged 1 commit into from
Aug 22, 2023

Conversation

nboisteault
Copy link
Member

Fix #3660 but just for next Lizmap 3.7. @mdouchin @rldhont Any other idea to fix it for previous versions?

Funded by 3Liz

@nboisteault nboisteault self-assigned this Aug 21, 2023
@github-actions github-actions bot added this to the 3.7.0 milestone Aug 21, 2023
@nboisteault nboisteault added bug javascript Pull requests that update Javascript code labels Aug 21, 2023
@nboisteault
Copy link
Member Author

@mdouchin @rldhont I could use lizMap.config.attributeLayers instead but is it enough?

@nboisteault nboisteault added backport release_3_5 run end2end If the PR must run end2end tests or not labels Aug 22, 2023
@nboisteault nboisteault merged commit 2a730e2 into 3liz:master Aug 22, 2023
13 checks passed
@nboisteault nboisteault deleted the fix_export_layers_with_accent branch August 22, 2023 09:24
@3liz-bot
Copy link
Contributor

The backport to release_3_5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 3491bdcee... Fix export layer with accent
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
Auto-merging assets/src/legacy/switcher-layers-actions.js
CONFLICT (content): Merge conflict in assets/src/legacy/switcher-layers-actions.js

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_5 release_3_5
# Navigate to the new working tree
cd .worktrees/backport-release_3_5
# Create a new branch
git switch --create backport-3853-to-release_3_5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 3491bdcee52ec0a729494727533da1d6e0dd4c6a
# Push it to GitHub
git push --set-upstream origin backport-3853-to-release_3_5
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3_5

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

@3liz-bot
Copy link
Contributor

The backport to release_3_6 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 3491bdcee... Fix export layer with accent
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
Auto-merging assets/src/legacy/switcher-layers-actions.js
CONFLICT (content): Merge conflict in assets/src/legacy/switcher-layers-actions.js

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_6 release_3_6
# Navigate to the new working tree
cd .worktrees/backport-release_3_6
# Create a new branch
git switch --create backport-3853-to-release_3_6
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 3491bdcee52ec0a729494727533da1d6e0dd4c6a
# Push it to GitHub
git push --set-upstream origin backport-3853-to-release_3_6
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3_6

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

nboisteault added a commit that referenced this pull request Aug 22, 2023
nboisteault added a commit that referenced this pull request Aug 22, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug failed backport javascript Pull requests that update Javascript code run end2end If the PR must run end2end tests or not
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: Export dropdown do not show in pop up if layer name in QGIS project has an accent
3 participants