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

Use correct online help and Git repository according to the correct QGIS Server wrapper used #5161

Merged
merged 1 commit into from
Jan 7, 2025

Conversation

Gustry
Copy link
Member

@Gustry Gustry commented Jan 6, 2025

As now, it's not only Py-QGIS-Server which can be used, it can also be QJazz :

image

CF work started in 3liz/qgis-lizmap-server-plugin#100

I also moved the commit ID next to the version number, same as for LWC main version and plugins.

PS : I have changed the name, temporary, in source code itself for the screenshot, for trying for now, waiting on 3liz/qgis-lizmap-server-plugin#102 and #4991

Copy link
Contributor

@nworr nworr left a comment

Choose a reason for hiding this comment

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

a small suggestion for a more precise locale name

but, since the wrapper is not mandatory, maybe this line is useless when wrapper is absent ?

lizmap/modules/admin/locales/en_US/admin.UTF-8.properties Outdated Show resolved Hide resolved
lizmap/modules/admin/templates/server_information.tpl Outdated Show resolved Hide resolved
@Gustry Gustry force-pushed the wrapper-help-and-url branch from d8d2fe1 to dd60d34 Compare January 7, 2025 08:28
@Gustry
Copy link
Member Author

Gustry commented Jan 7, 2025

I have fixed these strings.

but, since the wrapper is not mandatory, maybe this line is useless when wrapper is absent ?

I have added it so it's make a kind of advertisement for this "product". We were talking to slowly make it recommended

@Gustry Gustry added the run end2end If the PR must run end2end tests or not label Jan 7, 2025
@Gustry Gustry force-pushed the wrapper-help-and-url branch from dd60d34 to d62eaf0 Compare January 7, 2025 09:43
@Gustry Gustry merged commit 7205d9c into 3liz:master Jan 7, 2025
13 checks passed
@3liz-bot
Copy link
Contributor

3liz-bot commented Jan 7, 2025

The backport to release_3_7 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply d62eaf0a6... Use correct online help and Git repository according to the correct QGIS Server wrapper used
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/app/system/mainconfig.ini.php
Auto-merging lizmap/modules/admin/locales/en_US/admin.UTF-8.properties
CONFLICT (content): Merge conflict in lizmap/modules/admin/locales/en_US/admin.UTF-8.properties
Auto-merging lizmap/modules/admin/templates/server_information.tpl
CONFLICT (content): Merge conflict in lizmap/modules/admin/templates/server_information.tpl
Auto-merging tests/end2end/playwright/server-information.spec.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_7 release_3_7
# Navigate to the new working tree
cd .worktrees/backport-release_3_7
# Create a new branch
git switch --create backport-5161-to-release_3_7
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick d62eaf0a699b24e42239160d766401484db7d5ab
# Push it to GitHub
git push --set-upstream origin backport-5161-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-5161-to-release_3_7.

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.

3 participants