Add pickers for the space, include, order, mode and scope parameter #408 #456
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
Farcasut
commented
Jan 30, 2025
| ## TODO When https://jira.xwiki.org/browse/XWIKI-18965 is fixed move back to the newer $wikimacro API | ||
| #set($spaces = "$!xcontext.macro.params.spaces") | ||
| #if ($xcontext.macro.params.global != 'false') | ||
| #set ($spaces = "@ALL") |
There was a problem hiding this comment.
If the global parameter is marked, we override whatever value we had in the space with @ALL. I used this approach to ensure that I preserved the old behavior without adding complex logic that could break the macro.
Farcasut
commented
Jan 30, 2025
| #set($spaces = "$!wikimacro.parameters.get('spaces')") | ||
| #set($scope = "$!xcontext.macro.params.scope") | ||
| #if ($scope == 'specified') | ||
| #set ($scope="") |
There was a problem hiding this comment.
I can't have a blank value in an enum, so I used 'specified' and set it to blank, as this was the old default.
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.
Added pickers for all the parameters and moved part of the wikimacro API back to the xcontext API (XWiki-18965) to retrieve the raw values of the parameters. I also added translations for the enums in a translation page and updated the translations used by the parameter directly on the object. (I'm not sure why there are no translation keys for the macro, but I kept the consistency.)