XWIKI-22815: Variable is not computed correctly on subwikis #3877
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tmortagne
reviewed
Feb 6, 2025
| @@ -21,7 +21,7 @@ | |||
| ##!unique=request | |||
| #template("frequentlyUsedDocs.vm") | |||
| #set ($isGuest = $xcontext.getUser().equals('XWiki.XWikiGuest')) | |||
| #set ($isSuperAdmin = ($xcontext.user == 'XWiki.superadmin')) | |||
| #set ($isSuperAdmin = ($xcontext.user == 'XWiki.superadmin') || ($xcontext.user == "${services.wiki.mainWikiId}:XWiki.superadmin")) | |||
There was a problem hiding this comment.
Feels like we should stop have any kind of logic in this template and instead call some Java API which check that as it's supposed to be checked, in a single common location (for example, what your new version is doing is still quite different from what the authorization manager is doing which is currently what should be the reference).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Jira URL
https://jira.xwiki.org/browse/XWIKI-22815
Changes
Description
$isSuperAdminto make it work on sub-wikis.Clarifications
Screenshots & Video
N/A
Executed Tests
xwiki-platform-web-templates$isAdvancedUser || $isSuperAdminin at least 16 places, but afaiu$isSuperAdminimplies$isAdvancedUser, making the right hand side of the OR condition superfluousExpected merging strategy