New lizmap log file to show into lizmap admin.

[laurentj]

The admin page that shows log, now show only logs we want, that is usefull for the user.

Funded by 3Liz

[mdouchin]

🚀

[3liz-bot]

The backport to release_3_5 failed:

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

stderr

error: could not apply 7e4c71777... New lizmap log file to show into lizmap admin.
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 lizmap/modules/action/classes/action.listener.php
CONFLICT (content): Merge conflict in lizmap/modules/action/classes/action.listener.php
Auto-merging lizmap/modules/action/controllers/service.classic.php
Auto-merging lizmap/modules/admin/controllers/logs.classic.php
Auto-merging lizmap/modules/admin/controllers/maps.classic.php
Auto-merging lizmap/modules/admin/controllers/server_information.classic.php
CONFLICT (content): Merge conflict in lizmap/modules/admin/controllers/server_information.classic.php
CONFLICT (modify/delete): lizmap/modules/admin/zones/project_list.zone.php deleted in HEAD and modified in 7e4c71777 (New lizmap log file to show into lizmap admin.).  Version 7e4c71777 (New lizmap log file to show into lizmap admin.) of lizmap/modules/admin/zones/project_list.zone.php left in tree.
Auto-merging lizmap/modules/dataviz/controllers/service.classic.php
CONFLICT (content): Merge conflict in lizmap/modules/dataviz/controllers/service.classic.php
Auto-merging lizmap/modules/dynamicLayers/controllers/map.classic.php
Auto-merging lizmap/modules/filter/classes/filterDatasource.class.php
Auto-merging lizmap/modules/lizmap/classes/lizmapServices.class.php
Auto-merging lizmap/modules/lizmap/classes/qgisExpressionUtils.class.php
CONFLICT (content): Merge conflict in lizmap/modules/lizmap/classes/qgisExpressionUtils.class.php
Auto-merging lizmap/modules/lizmap/classes/qgisVectorLayer.class.php
CONFLICT (content): Merge conflict in lizmap/modules/lizmap/classes/qgisVectorLayer.class.php
Auto-merging lizmap/modules/lizmap/controllers/edition.classic.php
Auto-merging lizmap/modules/lizmap/lib/Form/QgisForm.php
Auto-merging lizmap/modules/lizmap/lib/Project/Project.php
CONFLICT (content): Merge conflict in lizmap/modules/lizmap/lib/Project/Project.php
Auto-merging lizmap/modules/lizmap/lib/Project/ProjectConfig.php
CONFLICT (content): Merge conflict in lizmap/modules/lizmap/lib/Project/ProjectConfig.php
Auto-merging lizmap/modules/lizmap/lib/Project/QgisProject.php
CONFLICT (content): Merge conflict in lizmap/modules/lizmap/lib/Project/QgisProject.php
Auto-merging lizmap/modules/lizmap/lib/Request/OGCRequest.php
Auto-merging lizmap/modules/lizmap/lib/Request/Proxy.php
CONFLICT (content): Merge conflict in lizmap/modules/lizmap/lib/Request/Proxy.php
Auto-merging lizmap/modules/lizmap/lib/Request/WFSRequest.php
Auto-merging lizmap/modules/lizmap/lib/Request/WMSRequest.php
Auto-merging lizmap/modules/lizmap/lib/Request/WMTSRequest.php
Auto-merging lizmap/var/config/mainconfig.ini.php

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

[3liz-bot]

The backport to release_3_6 failed:

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

stderr

error: could not apply 7e4c71777... New lizmap log file to show into lizmap admin.
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 lizmap/app/system/mainconfig.ini.php
Auto-merging lizmap/modules/action/classes/action.listener.php
CONFLICT (content): Merge conflict in lizmap/modules/action/classes/action.listener.php
Auto-merging lizmap/modules/action/controllers/service.classic.php
Auto-merging lizmap/modules/admin/controllers/server_information.classic.php
Auto-merging lizmap/modules/admin/zones/project_list.zone.php
Auto-merging lizmap/modules/lizmap/classes/lizmapServices.class.php
Auto-merging lizmap/modules/lizmap/classes/qgisExpressionUtils.class.php
CONFLICT (content): Merge conflict in lizmap/modules/lizmap/classes/qgisExpressionUtils.class.php
Auto-merging lizmap/modules/lizmap/classes/qgisVectorLayer.class.php
Auto-merging lizmap/modules/lizmap/lib/Project/Project.php
Auto-merging lizmap/modules/lizmap/lib/Project/ProjectConfig.php
CONFLICT (content): Merge conflict in lizmap/modules/lizmap/lib/Project/ProjectConfig.php
Auto-merging lizmap/modules/lizmap/lib/Project/QgisProject.php
CONFLICT (content): Merge conflict in lizmap/modules/lizmap/lib/Project/QgisProject.php
Auto-merging lizmap/modules/lizmap/lib/Request/OGCRequest.php
Auto-merging lizmap/modules/lizmap/lib/Request/WFSRequest.php
Auto-merging lizmap/modules/lizmap/lib/Request/WMSRequest.php

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