Modifications pour le document MacroService

Résumé

• Propriétés de la Page (2 modifications, 0 ajouts, 0 suppressions)

Détails

Propriétés de la Page

Auteur du document

...	...	@@ -1,1 +1,1 @@
1		-xwiki:XWiki.fcharton
	1	+XWiki.superadmin

Contenu

...	...	@@ -80,31 +80,30 @@
80	80	#end
81	81	#set ($discard = $extensionQuery.setInstalled(false, '', "wiki:$xcontext.database"))
82	82	#set ($extensions = $services.extension.index.repository.search($extensionQuery))
83		- #set ($macroExtensionCategory = $services.localization.render('ckeditor.plugin.macro.notinstalled'))
84	84	#if ($extensions.size > 0)
85	85	#set ($macroExtensionsMap = {})
86	86	#foreach ($extension in $extensions)
87	87	## TODO: move to a proper generic API to check if an extension can be installed by a given user
88		- #set ($extensionInstallAllowed = $services.security.authorization.hasAccess('programming', $xcontext.userReference, $NULL)
	87	+ #if ($services.security.authorization.hasAccess('programming')
89	89	|| (($extension.type == 'xar' || $extension.type == 'webjar')
90		- && $services.security.authorization.hasAccess('admin', $xcontext.userReference, "wiki:$xcontext.database") && $services.extension.isAllowed($extension, "wiki:$xcontext.database")))
91		- #foreach ($extensionComponent in $extension.getComponents())
92		- #if ($extensionComponent.roleType == 'org.xwiki.rendering.macro.Macro')
93		- #set ($discard = $macroExtensionsList.add({
94		- 'id' : {
95		- 'id' : $extensionComponent.roleHint
96		- },
97		- 'name': $extensionComponent.roleHint,
98		- 'description': $extension.summary,
99		- 'defaultCategory': '_notinstalled',
100		- 'extensionId' : $extension.id.id,
101		- 'extensionVersion' : $extension.id.version.value,
102		- 'extensionType' : $extension.type,
103		- 'extensionRecommended': $extension.recommended,
104		- 'extensionName': $extension.name,
105		- 'extensionSummary': $extension.summary,
106		- 'extensionInstallAllowed': $extensionInstallAllowed
107		- }))
	89	+ && $services.security.authorization.hasAccess('admin', "wiki:$xcontext.database") && $services.extension.isAllowed($extension, "wiki:$xcontext.database")))
	90	+ #foreach ($extensionComponent in $extension.getComponents())
	91	+ #if ($extensionComponent.roleType == 'org.xwiki.rendering.macro.Macro')
	92	+ #set ($discard = $macroExtensionsList.add({
	93	+ 'id' : {
	94	+ 'id' : $extensionComponent.roleHint
	95	+ },
	96	+ 'name': $extensionComponent.roleHint,
	97	+ 'description': $extension.summary,
	98	+ 'defaultCategory': '_notinstalled',
	99	+ 'extensionId' : $extension.id.id,
	100	+ 'extensionVersion' : $extension.id.version.value,
	101	+ 'extensionType' : $extension.type,
	102	+ 'extensionRecommended': $extension.recommended,
	103	+ 'extensionName': $extension.name,
	104	+ 'extensionSummary': $extension.summary
	105	+ }))
	106	+ #end
108	108	#end
109	109	#end
110	110	#end