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 regression : keep atlasprint plugin #4114

Merged
merged 5 commits into from
Jan 31, 2024

Conversation

rldhont
Copy link
Collaborator

@rldhont rldhont commented Jan 30, 2024

QGIS Server does not work atlas print does.

@rldhont rldhont added bug printing run end2end If the PR must run end2end tests or not backport release_3_7 labels Jan 30, 2024
@github-actions github-actions bot added this to the 3.8.0 milestone Jan 30, 2024
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.

@rldhont
Copy link
Collaborator Author

rldhont commented Jan 31, 2024

Changes done

@Gustry
Copy link
Member

Gustry commented Jan 31, 2024

The AtlasPrint is not required to run LWC. Pressing the button will lead to a 404 from QGIS server and the button will not work. Possible to use the PHP class lizmap/modules/lizmap/lib/Server/Server.php ?

@Gustry
Copy link
Member

Gustry commented Jan 31, 2024

Changes in the documentation : 3liz/lizmap-documentation#246

Your PR is partially reverting 25ee656, just to keep track for later

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.

Looks better to me

@rldhont rldhont merged commit 5b86923 into 3liz:master Jan 31, 2024
9 checks passed
@3liz-bot
Copy link
Contributor

The backport to release_3_7 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 88ea45bc9... Tests e2e: fixing atlas print
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
[backport-4114-to-release_3_7 827e01a22] Fix regrssion : keep atlasprint plugin
 Author: rldhont <rldhont@gmail.com>
 Date: Tue Jan 30 17:52:56 2024 +0100
 2 files changed, 5 insertions(+), 25 deletions(-)
[backport-4114-to-release_3_7 1c8993dea] Revert "UX - Do not display atlasprint anymore if it is not installed"
 Author: rldhont <rldhont@gmail.com>
 Date: Wed Jan 31 11:58:46 2024 +0100
 3 files changed, 21 deletions(-)
[backport-4114-to-release_3_7 13974b424] Force download for GetPrintAtlas response
 Author: rldhont <rldhont@gmail.com>
 Date: Wed Jan 31 09:01:13 2024 +0100
 1 file changed, 1 insertion(+)
[backport-4114-to-release_3_7 03ab4f743] Deactivate Atlas print when atlasprint plugin not found
 Author: rldhont <rldhont@gmail.com>
 Date: Wed Jan 31 11:55:53 2024 +0100
 1 file changed, 16 insertions(+), 3 deletions(-)
Auto-merging tests/end2end/playwright/print.spec.ts
CONFLICT (content): Merge conflict in tests/end2end/playwright/print.spec.ts

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_7 release_3_7
# Navigate to the new working tree
cd .worktrees/backport-release_3_7
# Create a new branch
git switch --create backport-4114-to-release_3_7
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 6e3b63aac2d9cafed168356c8a67a2a00dc0f6e7,1add07840901cfd139a534000d5ac3492f304bf6,632dbdd6d7af18b23f2715a4a4b8a1704710ad80,16d6796c5a4e8e3be68d95831e66019a6f1cb2dc,88ea45bc908b8e265bec23e8f1e4d4e50ac71277
# Push it to GitHub
git push --set-upstream origin backport-4114-to-release_3_7
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3_7

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

@Gustry
Copy link
Member

Gustry commented Jan 31, 2024

Another related commit in the plugin 2c504c0faa86972d1136da16f4dc4a78f6c4a7ee

@Gustry Gustry changed the title Fix regrssion : keep atlasprint plugin Fix regression : keep atlasprint plugin Jan 31, 2024
@rldhont rldhont deleted the fix-reactivate-atlasprint branch January 31, 2024 13:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants