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

XWIKI-13858: Inconsistency between Long Text and Content fields display in AWM wizard and entries #3594

Merged
merged 3 commits into from
Dec 10, 2024

Conversation

Sereza7
Copy link
Contributor

@Sereza7 Sereza7 commented Oct 24, 2024

Jira URL

https://jira.xwiki.org/browse/XWIKI-13858

Changes

Description

  • In all places where we can edit this object, we follow the userPreference regarding text editors.

Clarifications

  • The reason for the change we want to revert for XWIKI-8734 was that the CKEditor was too heavy to get in the UI. However, it seems like nowadays we have it in other places in the UI and it does not pose any issue.

Screenshots & Video

Screenshots only for the class editor. On the ticket there's already screenshots showing that the issue has been solved for the entry editor.
Before the PR
With prefered editor = text
Screenshot from 2024-10-24 15-03-24
With prefered editor = Wysiwyg
Screenshot from 2024-10-24 15-03-38
After the PR
With prefered editor = text
Screenshot from 2024-10-24 15-28-02
With prefered editor = Wysiwyg
Screenshot from 2024-10-24 15-28-16

Executed Tests

Manual tests (see above).
There was no test change when merging e6b6769 ,which is partly what we revert.

Expected merging strategy

  • Prefers squash: Yes
  • Backport on branches:
    • 16.4.X
    • 15.10.X

…ay in AWM wizard and entries

* In all places where we can edit this object, we follow the userPreference regarding text editors.
@Sereza7 Sereza7 added backport stable-15.10.x Used for automatic backport to 15.10.x branch. backport stable-16.4.x labels Oct 24, 2024
@Sereza7 Sereza7 removed the backport stable-15.10.x Used for automatic backport to 15.10.x branch. label Oct 31, 2024
Copy link
Member

@mflorea mflorea left a comment

Choose a reason for hiding this comment

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

The comments should be deleted / moved along with the related code.

@Sereza7
Copy link
Contributor Author

Sereza7 commented Dec 10, 2024

The comments have been reviewed and the PR is ready for further reviewing or a merge.

Thank you for the review MFlorea!

@mflorea mflorea merged commit a81ba09 into xwiki:master Dec 10, 2024
1 check passed
github-actions bot pushed a commit that referenced this pull request Dec 10, 2024
…ay in AWM wizard and entries (#3594)

* In all places where we can edit this object, we follow the userPreference regarding text editors.

(cherry picked from commit a81ba09)
mflorea pushed a commit that referenced this pull request Dec 10, 2024
…ay in AWM wizard and entries (#3594)

* In all places where we can edit this object, we follow the userPreference regarding text editors.

(cherry picked from commit a81ba09)
mflorea pushed a commit that referenced this pull request Dec 10, 2024
…ay in AWM wizard and entries (#3594)

* In all places where we can edit this object, we follow the userPreference regarding text editors.

(cherry picked from commit a81ba09)
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.

2 participants