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

Server atlas print fix pk-less layers #45521

Merged
merged 4 commits into from
Oct 30, 2021
Merged

Conversation

elpaso
Copy link
Contributor

@elpaso elpaso commented Oct 14, 2021

Fix pk-less layers atlas print #30817

@elpaso elpaso added Bug Either a bug report, or a bug fix. Let's hope for the latter! Server Related to QGIS server backport queued_ltr_backports Queued Backports labels Oct 14, 2021
@github-actions github-actions bot added this to the 3.22.0 milestone Oct 14, 2021
@elpaso
Copy link
Contributor Author

elpaso commented Oct 29, 2021

@rldhont @pblottiere @dmarteau gentle review ping...

Copy link
Contributor

@rldhont rldhont left a comment

Choose a reason for hiding this comment

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

just 2 comments

src/server/services/wms/qgswmsrenderer.cpp Outdated Show resolved Hide resolved
src/server/services/wms/qgswmsrenderer.cpp Outdated Show resolved Hide resolved
@elpaso
Copy link
Contributor Author

elpaso commented Oct 29, 2021

@rldhont comments addressed, thank you for the review.

Copy link
Contributor

@dmarteau dmarteau left a comment

Choose a reason for hiding this comment

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

Simple typo change

src/server/services/wms/qgswmsrenderer.cpp Outdated Show resolved Hide resolved
Co-authored-by: David Marteau <dmarteau@3liz.com>
@elpaso elpaso merged commit 80ed176 into qgis:master Oct 30, 2021
@elpaso elpaso deleted the bugfix-gh30817-reborn branch October 30, 2021 16:36
@qgis-bot
Copy link
Collaborator

The backport to queued_ltr_backports failed:

The process '/usr/bin/git' failed with exit code 1

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-queued_ltr_backports queued_ltr_backports
# Navigate to the new working tree
cd .worktrees/backport-queued_ltr_backports
# Create a new branch
git switch --create backport-45521-to-queued_ltr_backports
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 96808065a45747a64235db17649be26b5d23f321,ce2d58d0a78ca76776fb2c9c30f88397356a7df5,6f8bed820b3e50076f308d3e426a871dafc364f9,96187b20c562442d254d907928eb2c1d9bfc9d46
# Push it to GitHub
git push --set-upstream origin backport-45521-to-queued_ltr_backports
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-queued_ltr_backports

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport queued_ltr_backports Queued Backports Bug Either a bug report, or a bug fix. Let's hope for the latter! Server Related to QGIS server
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants