Modifications pour le document Confluence bridge for Attachments

Résumé

• Propriétés de la Page (1 modifications, 0 ajouts, 0 suppressions)
• Objets (2 modifications, 0 ajouts, 0 suppressions)
  • XWiki.JavaScriptExtension[0]
  • XWiki.WikiMacroClass[0]

Détails

Propriétés de la Page

Auteur du document

...	...	@@ -1,1 +1,1 @@
1		-XWiki.superadmin
	1	+XWiki.admin

XWiki.JavaScriptExtension[0]

Code

...	...	@@ -8,6 +8,12 @@
8	8	});
9	9
10	10	require(['jquery', 'xwiki-l10n!xwiki-confluence-attachments-messages'], function($, l10n) {
	11	+
	12	+ // Trigger Collabora integration.
	13	+ $(document).on('xwiki:livedata:entriesUpdated', function(){
	14	+ $(document).trigger('xwiki:collabora:addButtons');
	15	+ });
	16	+
11	11	var enhanceUploadInputs = function(liveDataElems) {
12	12	$.each(liveDataElems.find('input[type=file]'), function() {
13	13	// Since the attachments liveData is refreshed on file upload, there is no need for a response container.

XWiki.WikiMacroClass[0]

Code de la macro

...	...	@@ -169,7 +169,7 @@
169	169	#end
170	170
171	171	{{html clean="false" wiki="true"}}
172		- <div class='confluenceAttachmentsMacro'>
	172	+ <div class='attachments confluenceAttachmentsMacro'>
173	173	#showConfluenceAttachments($document)
174	174	</div>
175	175	{{/html}}
...	...	@@ -181,7 +181,7 @@
181	181	## We need to check if there is a valid license because the macro is registered even if the user doesn't have view right
182	182	## on the macro definition page. See XWIKI-14828: Rendering macros defined in wiki pages are available to users that
183	183	## don't have view right on those pages.
184		-#if ($services.promacrolicensing.hasLicensureForEntity($xcontext.macro.doc.documentReference))
	184	+#if ($services.licensing.licensor.hasLicensureForEntity($xcontext.macro.doc.documentReference))
185	185	#executeMacro
186	186	#else
187	187	{{missingLicenseMessage extensionName="proMacros.extension.name"/}}