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

Show not found layers in the CFG for admins #5480

Merged
merged 1 commit into from
Mar 3, 2025

Conversation

Gustry
Copy link
Member

@Gustry Gustry commented Feb 26, 2025

Follow up from #5304, it displays a message for admins about layers which are not found in the CFG file (but present in the WMS GetCapabilities)

Related to #5424 about how we want to manage admin/not admins in LWC, and also how to report "broken" project to the GIS administrator about errors reported on the "client" side.

Another change : we always log in the console in case of warning about the QGIS project, even if the user is not an GIS administrator

@Gustry Gustry requested a review from rldhont February 26, 2025 13:23
@github-actions github-actions bot added this to the 3.10.0 milestone Feb 26, 2025
@Gustry Gustry marked this pull request as draft February 26, 2025 13:27
@Gustry Gustry marked this pull request as ready for review February 27, 2025 13:11
@Gustry Gustry force-pushed the invalid-layers branch 2 times, most recently from a970029 to 6897a7e Compare February 27, 2025 13:14
@Gustry Gustry added the run end2end If the PR must run end2end tests or not label Feb 27, 2025
@Gustry Gustry merged commit 1bf3962 into 3liz:master Mar 3, 2025
19 of 20 checks passed
@3liz-bot
Copy link
Contributor

3liz-bot commented Mar 3, 2025

The backport to release_3_8 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 4424387e9... Always log in the console in case of warnings, display a message for GIS for invalid layers in CFG
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 set advice.mergeConflict false"

stdout
Auto-merging assets/src/modules/ExecuteJSFromServer.js
CONFLICT (content): Merge conflict in assets/src/modules/ExecuteJSFromServer.js
Auto-merging lizmap/modules/view/controllers/lizMap.classic.php
CONFLICT (content): Merge conflict in lizmap/modules/view/controllers/lizMap.classic.php
Auto-merging lizmap/modules/view/locales/en_US/dictionnary.UTF-8.properties

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-5480-to-release_3_8
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 4424387e91fcc9bbaca5e97828819de129d35cba
# Push it to GitHub
git push --set-upstream origin backport-5480-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-5480-to-release_3_8.

@3liz-bot
Copy link
Contributor

3liz-bot commented Mar 3, 2025

The backport to release_3_9 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 4424387e9... Always log in the console in case of warnings, display a message for GIS for invalid layers in CFG
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 set advice.mergeConflict false"

stdout
Auto-merging assets/src/modules/ExecuteJSFromServer.js
CONFLICT (content): Merge conflict in assets/src/modules/ExecuteJSFromServer.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_9 release_3_9
# Navigate to the new working tree
cd .worktrees/backport-release_3_9
# Create a new branch
git switch --create backport-5480-to-release_3_9
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 4424387e91fcc9bbaca5e97828819de129d35cba
# Push it to GitHub
git push --set-upstream origin backport-5480-to-release_3_9
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3_9

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

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