Aller au contenu

Modifications pour le document MacroService

Modifié par Florent Charton le 2026/03/13 11:04
Depuis la version 3.1
modifié par Florent Charton
sur 2024/08/08 18:44
Commentaire de modification : Install extension [org.xwiki.platform:xwiki-platform-ckeditor-ui/15.10.11]
À la version 4.1
modifié par Florent Charton
sur 2025/08/19 15:16
Commentaire de modification : Install extension [org.xwiki.platform:xwiki-platform-ckeditor-ui/17.4.3]

Résumé

Détails

Propriétés de la Page
Contenu
... ... @@ -57,17 +57,6 @@
57 57  
58 58   #set ($syntax = $services.rendering.resolveSyntax($syntaxId))
59 59   #set ($macroDescriptors = $services.rendering.getMacroDescriptors($syntax))
60 - #if (!$macroDescriptors)
61 - ## Before XWiki 9.7RC1 we had to use APIs that require programming rights.
62 - #set ($macroDescriptors = [])
63 - #try()
64 - #set ($macroManager = $services.component.getInstance('org.xwiki.rendering.macro.MacroManager'))
65 - #foreach ($macroId in $macroManager.getMacroIds($syntax))
66 - #set ($macroDescriptor = $macroManager.getMacro($macroId).descriptor)
67 - #set ($discard = $macroDescriptors.add($macroDescriptor))
68 - #end
69 - #end
70 - #end
71 71   #set ($data = {})
72 72   #set ($allMacrosExcludedCategories = [])
73 73   #set ($discard = $allMacrosExcludedCategories.add("#maybeTranslate('rendering.macroCategory.Internal' 'Internal')"))
... ... @@ -109,7 +109,7 @@
109 109   }))
110 110   #end
111 111   #end
112 - #set ($macroList = $resolvedSortTool.sort($macroList, 'name'))
101 + #set ($macroList = $collectiontool.sort($macroList, 'name'))
113 113   #set ($discard = $data.put('list', $macroList))
114 114   ## Get macros provided by compatible available extensions
115 115   #set ($macroExtensionsList = [])
... ... @@ -161,8 +161,6 @@
161 161  #end
162 162  
163 163  #macro (maybeGetMacroDescriptor $macroIdAsString)
164 - #set ($xmacro = $NULL)
165 - #set ($macroDescriptor = $NULL)
166 166   #set ($macroId = $services.rendering.resolveMacroId($macroIdAsString))
167 167   #if ($macroId)
168 168   #set ($macroDescriptor = $services.rendering.getMacroDescriptor($macroId))
... ... @@ -171,41 +171,12 @@
171 171   #set ($macroId = $services.rendering.resolveMacroId($macroId.id))
172 172   #set ($macroDescriptor = $services.rendering.getMacroDescriptor($macroId))
173 173   #end
174 - #else
175 - ## Either the macro id could not be resolved (unlikely) or we are on an older XWiki instance (before 10.10RC1) where
176 - ## we had to use APIs that require programming rights.
177 - #getMacroWithPR($macroIdAsString)
178 - #if ($xmacro)
179 - #set ($macroDescriptor = $xmacro.descriptor)
161 + #if ($macroDescriptor)
162 + #getMacroDescriptor($macroDescriptor)
180 180   #end
181 181   #end
182 - #if ($macroDescriptor)
183 - #getMacroDescriptor($macroDescriptor)
184 - #if ($xmacro)
185 - ## supportsInlineMode was not exposed on the macro descriptor before XWiki 10.10RC1.
186 - #set ($data.supportsInlineMode = $xmacro.supportsInlineMode())
187 - #end
188 - #end
189 189  #end
190 190  
191 -#macro (getMacroWithPR $macroIdAsString)
192 - #set ($xmacro = $NULL)
193 - #try()
194 - #set ($macroIdFactory = $services.component.getInstance('org.xwiki.rendering.macro.MacroIdFactory'))
195 - #set ($macroId = $macroIdFactory.createMacroId($macroIdAsString))
196 - #set ($macroManager = $services.component.getInstance('org.xwiki.rendering.macro.MacroManager'))
197 - #if ($macroManager.exists($macroId))
198 - #set ($xmacro = $macroManager.getMacro($macroId))
199 - #elseif ($macroId.syntax)
200 - ## Try the macro id without the syntax.
201 - #set ($macroId = $macroIdFactory.createMacroId($macroId.id))
202 - #if ($macroManager.exists($macroId))
203 - #set ($xmacro = $macroManager.getMacro($macroId))
204 - #end
205 - #end
206 - #end
207 -#end
208 -
209 209  #macro (getMacroDescriptor $macroDescriptor)
210 210   ## Translate the macro name and description.
211 211   #set ($macroTranslationKey = "rendering.macro.$macroDescriptor.id")
... ... @@ -240,13 +240,6 @@
240 240   #set ($parameterDescriptor = $entry.value)
241 241   ## Translate the parameter name and description.
242 242   #set ($parameterTranslationKey = "${macroTranslationKey}.parameter.$parameterDescriptor.id")
243 - ## Note: The displayHidden parameter is new in XWiki 12.4RC1 so make sure we set 'hidden' to false if it doesn't
244 - ## exist
245 - #if ("$!parameterDescriptor.displayHidden" != '')
246 - #set ($parameterHidden = $parameterDescriptor.displayHidden)
247 - #else
248 - #set ($parameterHidden = false)
249 - #end
250 250   #set ($translatedParameterDescriptor = {
251 251   'id': $parameterDescriptor.id,
252 252   'name': "#maybeTranslate(""${parameterTranslationKey}.name"" $parameterDescriptor.name)",
... ... @@ -256,13 +256,9 @@
256 256   'advanced': $parameterDescriptor.advanced,
257 257   'defaultValue': $parameterDescriptor.defaultValue,
258 258   'type': $parameterDescriptor.displayType,
259 - 'hidden' : $parameterHidden,
210 + 'hidden' : $parameterDescriptor.displayHidden,
260 260   'index': $foreach.index
261 261   })
262 - #if ("$!translatedParameterDescriptor.type" == '')
263 - ## displayType is not available before XWiki 11.0 so we need to fall back on parameterType.
264 - #set ($translatedParameterDescriptor.type = $parameterDescriptor.parameterType)
265 - #end
266 266   #set ($translatedParameterDescriptor.caseInsensitive = $translatedParameterDescriptor.type.isEnum())
267 267   #set ($groupDescriptor = $parameterDescriptor.groupDescriptor)
268 268   #if ($groupDescriptor)
... ... @@ -288,10 +288,7 @@
288 288   #end
289 289   #set ($translatedParameterDescriptor.editTemplate = $translatedParameterDescriptor.editTemplate.trim())
290 290   #fixDescriptorType($translatedParameterDescriptor)
291 - ## Make sure the key is lowercase (for XWiki <9.0).
292 - ## See XWIKI-13990: Inconsistency between Java-based and Wiki-based rendering macros regarding the parameter
293 - ## descriptor map keys
294 - #set ($discard = $data.parameterDescriptorMap.put($entry.key.toLowerCase(), $translatedParameterDescriptor))
238 + #set ($discard = $data.parameterDescriptorMap.put($entry.key, $translatedParameterDescriptor))
295 295   #end
296 296   #if ($groupDescriptorTree.groups)
297 297   #set ($data.groupDescriptorTree = $groupDescriptorTree.groups)