lizmap-web-client
lizmap-web-client copied to clipboard
Editing - Fix: the HTML form widget must use WYSIWIG editor
LWC editing form must show a WYSIWYG editor when the map editor has configured a text field widget with the option "Use HTML"
Funded by Parc naturel régional du Pilat https://www.parc-naturel-pilat.fr/
cc @rldhont @Gustry
@laurentj I created this PR to make this bug reproducible. Could you have a look and see why the HTML widget is not used (and instead a simple online text widget) ?
Cypress is ✅
The backport to release_3_5
failed:
The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply b0e68d61c... PHPStan: remove ignored errors
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 tests/end2end/cypress/integration/form_edition_all_field_type-ghaction.js
Auto-merging tests/qgis-projects/tests/tests_dataset.sql
[backport-3254-to-release_3_5 12e025cf4] Editing - Fix: the HTML form widget must use WYSIWIG editor
Author: Michael Douchin <[email protected]>
Date: Wed Sep 28 16:41:28 2022 +0200
3 files changed, 128 insertions(+), 225 deletions(-)
Auto-merging lizmap/modules/lizmap/lib/Form/QgisFormControl.php
Auto-merging lizmap/modules/lizmap/lib/Project/QgisProject.php
[backport-3254-to-release_3_5 c89b5f379] [Bugfix] Edition: The QGIS UseHtml properties was not well converted
Author: rldhont <[email protected]>
Date: Thu Nov 3 10:18:54 2022 +0100
2 files changed, 12 insertions(+), 5 deletions(-)
Auto-merging phpstan-baseline.neon
CONFLICT (content): Merge conflict in phpstan-baseline.neon
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-3254-to-release_3_5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 1f24ab9c88267f65e1d56d779128a4b38e98df7c,a342f435a3a6a47381277c08658dfb164961189d,b0e68d61cebea0410f267afdbf486988ef9c44cd
# Push it to GitHub
git push --set-upstream origin backport-3254-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-3254-to-release_3_5
.