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.

Sign up for GitHub

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

Jump to bottom

XWIKI-22662: Impossible to access any editor if the content contains a call to a macro named "default" #3650

Merged
merged 1 commit into from
Nov 19, 2024
Merged

XWIKI-22662: Impossible to access any editor if the content contains a call to a macro named "default" #3650

merged 1 commit into from
Nov 19, 2024

Conversation

michitux
Copy link
Contributor

Jira URL

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

Changes

Description

  • Don't try loading the "default" RequiredRightAnalyzer for a macro named "default".
  • Add a test case for the default macro.

Clarifications

  • It is still possible to write a required rights analyzer for the "default" macro by implementing MacroRequiredRightsAnalyzer, this is also what the unit test now verifies.

Screenshots & Video

No UI changes.

Executed Tests

LANG=C.UTF-8 mvn clean install -Pdocker,legacy,integration-tests,snapshotModules,quality -pl $(git diff --name-only origin/master | awk -F'/' '{for(i=NF-1; i>0; i--){if($i ~ /src$/){printf(":%s\n", $(i-1)); break;}}}' | sort -u | paste -sd "," -)

Expected merging strategy

  • Prefers squash: Yes
  • Backport on branches: all (fix for blocker)
    • stable-15.10.x
    • stable-16.4.x
    • stable-16.10.x

@michitux
XWIKI-22662: Impossible to access any editor if the content contains …
9cc121f 
…a call to a macro named "default"

* Don't try loading the "default" RequiredRightAnalyzer<MacroBlock> for
  a macro named "default".
* Add a test case for the default macro.
@michitux michitux merged commit 471381d into xwiki:master Nov 19, 2024
4 checks passed
@michitux michitux deleted the XWIKI-22662 branch November 19, 2024 15:09
github-actions bot pushed a commit that referenced this pull request Nov 19, 2024
@michitux @github-actions
XWIKI-22662: Impossible to access any editor if the content contains …
6dbdd08 
…a call to a macro named "default" (#3650)

* Don't try loading the "default" RequiredRightAnalyzer<MacroBlock> for
  a macro named "default".
* Add a test case for the default macro.

(cherry picked from commit 471381d)
@github-actions github-actions bot mentioned this pull request Nov 19, 2024
Merged
github-actions bot pushed a commit that referenced this pull request Nov 19, 2024
@michitux @github-actions
XWIKI-22662: Impossible to access any editor if the content contains …
e489018 
…a call to a macro named "default" (#3650)

* Don't try loading the "default" RequiredRightAnalyzer<MacroBlock> for
  a macro named "default".
* Add a test case for the default macro.

(cherry picked from commit 471381d)
@github-actions github-actions bot mentioned this pull request Nov 19, 2024
Merged
github-actions bot pushed a commit that referenced this pull request Nov 19, 2024
@michitux @github-actions
XWIKI-22662: Impossible to access any editor if the content contains …
42110f4 
…a call to a macro named "default" (#3650)

* Don't try loading the "default" RequiredRightAnalyzer<MacroBlock> for
  a macro named "default".
* Add a test case for the default macro.

(cherry picked from commit 471381d)
@github-actions github-actions bot mentioned this pull request Nov 19, 2024
Merged
michitux added a commit that referenced this pull request Nov 19, 2024
@michitux
XWIKI-22662: Impossible to access any editor if the content contains …
1281aff 
…a call to a macro named "default" (#3650)

* Don't try loading the "default" RequiredRightAnalyzer<MacroBlock> for
  a macro named "default".
* Add a test case for the default macro.

(cherry picked from commit 471381d)
michitux added a commit that referenced this pull request Nov 19, 2024
@michitux
XWIKI-22662: Impossible to access any editor if the content contains …
b82e7fe 
…a call to a macro named "default" (#3650)

* Don't try loading the "default" RequiredRightAnalyzer<MacroBlock> for
  a macro named "default".
* Add a test case for the default macro.

(cherry picked from commit 471381d)
michitux added a commit that referenced this pull request Nov 19, 2024
@michitux
XWIKI-22662: Impossible to access any editor if the content contains …
5112d02 
…a call to a macro named "default" (#3650)

* Don't try loading the "default" RequiredRightAnalyzer<MacroBlock> for
  a macro named "default".
* Add a test case for the default macro.

(cherry picked from commit 471381d)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tmortagne tmortagne tmortagne approved these changes

Assignees
No one assigned
Labels
backport stable-15.10.x Used for automatic backport to 15.10.x branch. backport stable-16.4.x backport stable-16.10.x
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@michitux @tmortagne