Changes for page Attachments
Last modified by Wilton Risenhoover on 2020/04/08 17:29
Change comment:
Install extension [org.xwiki.platform:xwiki-platform-attachment-ui/12.2.1]
Summary
-
Page properties (1 modified, 0 added, 0 removed)
-
Objects (4 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -1,17 +1,21 @@ 1 1 {{velocity output="false"}} 2 +#set ($translationPrefix = 'xe.attachmentSelector') 3 + 2 2 #if ($request.xaction == 'postUpload') 3 3 #set ($targetDocument = $xwiki.getDocument($request.get('docname'))) 4 4 #set ($targetAttachDocument = $xwiki.getDocument($request.get('targetdocname'))) 5 5 6 6 #set ($fieldname = $request.get('fieldname')) 9 + #set ($comment = $services.localization.render("${translationPrefix}.postUpload.comment", [$fieldname])) 7 7 #set ($docAction = $request.get('docAction')) 8 8 #set ($attachmentList = $targetAttachDocument.getAttachmentList()) 9 9 #if ($attachmentList && $attachmentList.size() > 0) 10 - #set ($sortedAttachments = $ sorttool.sort($attachmentList, 'date:desc'))13 + #set ($sortedAttachments = $collectiontool.sort($attachmentList, 'date:desc')) 11 11 #set ($lastAttachment = $sortedAttachments.get(0)) 12 12 #end 13 13 $response.sendRedirect($targetDocument.getURL($docAction, $escapetool.url({ 14 14 $fieldname: $lastAttachment.filename, 18 + 'comment': $comment, 15 15 'form_token': $request.form_token 16 16 }))) 17 17 #stop ... ... @@ -22,7 +22,6 @@ 22 22 ## 23 23 ## Macros 24 24 ## 25 -#set ($translationPrefix = 'xe.attachmentSelector') 26 26 #set ($attachmentPickerDocName = 'XWiki.AttachmentSelector') 27 27 28 28 $xwiki.ssx.use($attachmentPickerDocName) ... ... @@ -46,7 +46,7 @@ 46 46 #attachmentPicker_displayUploadForm($targetDocument, $targetAttachDocument, $options) 47 47 #end 48 48 #attachmentPicker_displayAttachmentGalleryEmptyValue($targetDocument, $targetAttachDocument, $options, $currentValue) 49 - #set ($sortedAttachments = $ sorttool.sort($targetAttachDocument.getAttachmentList(), "${options.sortAttachmentsBy}") )52 + #set ($sortedAttachments = $collectiontool.sort($targetAttachDocument.getAttachmentList(), "${options.sortAttachmentsBy}") ) 50 50 #foreach ($attachment in $sortedAttachments) 51 51 #set ($extension = $attachment.getFilename()) 52 52 #set ($extension = $extension.substring($mathtool.add($extension.lastIndexOf('.'), 1)).toLowerCase()) ... ... @@ -109,12 +109,12 @@ 109 109 #if ($attachment.isImage() && $options.displayImage) 110 110 ## We add the version to the query string in order to invalidate the cache when an image attachment is replaced. 111 111 #set ($queryString = $escapetool.url({'version': $attachment.version})) 112 - [[[[image:$attachmentStringReference||width=180 queryString="$queryString"]]>>attach:$attachmentStringReference]] 115 + [[[[image:${attachmentStringReference}||width=180 queryString="$queryString"]]>>attach:$attachmentStringReference]] 113 113 #else 114 114 * (% class="mime" %){{html wiki=false clean=false}}#mimetypeimg($attachment.getMimeType().toLowerCase() $attachment.getFilename().toLowerCase()){{/html}}(%%) (% class="filename" %)$attachment.getFilename()(% %) 115 115 * v$attachment.getVersion() (#dynamicsize($attachment.longSize)) 116 116 * $services.localization.render('core.viewers.attachments.author', [$!{xwiki.getUserName($attachment.author, false)}]) $services.localization.render('core.viewers.attachments.date', [$!{xwiki.formatDate($attachment.date, 'dd/MM/yyyy hh:mm')}]) 117 - * (% class="buttonwrapper" %)[[${services.localization.render("${translationPrefix}.actions.download")}>>attach:$attachmentStringReference||title="$services.localization.render("${translationPrefix}.actions.download")" rel="__blank" class="button"]](%%) 120 + * (% class="buttonwrapper" %)[[${services.localization.render("${translationPrefix}.actions.download")}>>attach:${attachmentStringReference}||title="$services.localization.render("${translationPrefix}.actions.download")" rel="__blank" class="button"]](%%) 118 118 #end 119 119 #end 120 120 #end ... ... @@ -282,7 +282,7 @@ 282 282 #end 283 283 #set ($options = { 284 284 'classname' : ${request.get('classname')}, 285 - 'object' : $!{m athtool.toInteger($request.object)},288 + 'object' : $!{numbertool.toNumber($request.object).intValue()}, 286 286 'property' : ${request.property}, 287 287 'displayImage' : ${displayImage}, 288 288 'docAction' : ${docAction}, ... ... @@ -296,7 +296,7 @@ 296 296 #attachmentPicker_displayAttachmentGallery($targetDocument, $targetAttachDocument, $options) 297 297 298 298 (% class="gallery_buttons buttons" %)((( 299 - (% class="buttonwrapper secondary" %)[[$services.localization.render("${translationPrefix}.cancel")>>$targetDocument||class="button secondary" id="attachment-picker-close"]] 302 + (% class="buttonwrapper secondary" %)[[$services.localization.render("${translationPrefix}.cancel")>>${targetDocument}||class="button secondary" id="attachment-picker-close"]] 300 300 ))) 301 301 #end 302 302 {{/velocity}}
- XWiki.WikiMacroClass[0]
-
- Macro code
-
... ... @@ -32,7 +32,7 @@ 32 32 #end 33 33 #set ($classname = "$!{xcontext.macro.params.classname}") 34 34 #set ($property = "$!{xcontext.macro.params.property}") 35 -#set ($object = $m athtool.toInteger("$!{xcontext.macro.params.object}"))35 +#set ($object = $numbertool.toNumber("$!{xcontext.macro.params.object}").intValue()) 36 36 #if ("$!{object}" != $!{xcontext.macro.params.object}) 37 37 #set ($object = ${doc.getObject($classname).number}) 38 38 #if ("$!{object}" == '') ... ... @@ -138,7 +138,7 @@ 138 138 #if ($hasTargetDoc) 139 139 #set ($queryString.targetdocname = $targetdoc.fullName) 140 140 #end 141 - (% class="buttonwrapper" %)[[$buttontext>>$xcontext.macro.doc.fullName||queryString="$escapetool.url($queryString)" 141 + (% class="buttonwrapper" %)[[$buttontext>>${xcontext.macro.doc.fullName}||queryString="$escapetool.url($queryString)" 142 142 class="attachment-picker-start button" title="$buttontext"]](%%)## 143 143 #end 144 144 #end - Cached
-
... ... @@ -1,0 +1,1 @@ 1 +No - Asynchronous rendering
-
... ... @@ -1,0 +1,1 @@ 1 +No
- XWiki.WikiMacroParameterClass[0]
-
- Parameter type
-
... ... @@ -1,0 +1,1 @@ 1 +org.xwiki.model.reference.DocumentReference
- XWiki.WikiMacroParameterClass[10]
-
- Parameter type
-
... ... @@ -1,0 +1,1 @@ 1 +org.xwiki.model.reference.AttachmentReference
- XWiki.WikiMacroParameterClass[18]
-
- Parameter type
-
... ... @@ -1,0 +1,1 @@ 1 +org.xwiki.model.reference.DocumentReference
