Changes for page Confluence bridge for Attachments
Last modified by Frank Fock on 2026/04/03 11:52
From version 5.1
edited by Frank Fock
on 2026/04/03 11:46
on 2026/04/03 11:46
Change comment:
Migrated property [contentOrder] from class [XWiki.WikiMacroClass]
To version 7.1
edited by Frank Fock
on 2026/04/03 11:52
on 2026/04/03 11:52
Change comment:
Install extension [com.xwiki.pro:xwiki-pro-macros-confluence-bridges-ui/1.30.1]
Summary
-
Objects (2 modified, 0 added, 0 removed)
Details
- 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]
-
- Macro code
-
... ... @@ -118,29 +118,14 @@ 118 118 } 119 119 }) 120 120 121 - #if ("$!wikimacro.parameters.patterns" != '') 122 - #set ($liveDataConfig.query = {}) 123 - #set ($liveDataConfig.query.filters = [ 124 - { 125 - "property": "filename", 126 - "matchAll": true, 127 - "constraints": [] 128 - } 129 - ]) 130 - #set ($filters = $stringtool.split($wikimacro.parameters.patterns, ',')) 131 - #foreach ($filter in $filters) 132 - #set ($discard = $liveDataConfig.query.filters[0].constraints.add( 133 - { "operator": "contains", "value": "$!filter.trim()" } 134 - )) 135 - #end 136 - #end 137 137 #set ($sourceParams = { 138 138 'translationPrefix': 'core.viewers.attachments.livetable.', 139 139 'className': 'XWiki.AllAttachments', 140 - "\$doc": "$attachmentsDoc" 124 + "\$doc": "$attachmentsDoc", 125 + 'patterns': "$!wikimacro.parameters.patterns" 141 141 }) 142 142 #set ($discard = $sourceParams.put('template', 'xpart.vm')) 143 - #set ($discard = $sourceParams.put('vm', ' attachmentsjson.vm'))128 + #set ($discard = $sourceParams.put('vm', 'filteredAttachments.vm')) 144 144 #getLiveDataSort($liveDataSort) 145 145 #if ($invalidSortBy) 146 146 {{warning}} ... ... @@ -184,7 +184,7 @@ 184 184 #end 185 185 186 186 {{html clean="false" wiki="true"}} 187 - <div class='confluenceAttachmentsMacro'> 172 + <div class='attachments confluenceAttachmentsMacro'> 188 188 #showConfluenceAttachments($document) 189 189 </div> 190 190 {{/html}}