Changes for page Attachments
Last modified by Ludovic Dubost on 2024/07/22 15:50
From version 14.1
edited by Ludovic Dubost
on 2022/04/20 17:58
on 2022/04/20 17:58
Change comment:
Install extension [org.xwiki.platform:xwiki-platform-attachment-ui/14.0]
To version 9.1
edited by Ludovic Dubost
on 2019/08/02 10:59
on 2019/08/02 10:59
Change comment:
Migrated property [contentJavaType] from class [XWiki.WikiMacroClass]
Summary
-
Page properties (1 modified, 0 added, 0 removed)
-
Objects (6 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -1,21 +1,17 @@ 1 1 {{velocity output="false"}} 2 -#set ($translationPrefix = 'xe.attachmentSelector') 3 - 4 4 #if ($request.xaction == 'postUpload') 5 5 #set ($targetDocument = $xwiki.getDocument($request.get('docname'))) 6 6 #set ($targetAttachDocument = $xwiki.getDocument($request.get('targetdocname'))) 7 7 8 8 #set ($fieldname = $request.get('fieldname')) 9 - #set ($comment = $services.localization.render("${translationPrefix}.postUpload.comment", [$fieldname])) 10 10 #set ($docAction = $request.get('docAction')) 11 11 #set ($attachmentList = $targetAttachDocument.getAttachmentList()) 12 12 #if ($attachmentList && $attachmentList.size() > 0) 13 - #set ($sortedAttachments = $ collectiontool.sort($attachmentList, 'date:desc'))10 + #set ($sortedAttachments = $sorttool.sort($attachmentList, 'date:desc')) 14 14 #set ($lastAttachment = $sortedAttachments.get(0)) 15 15 #end 16 16 $response.sendRedirect($targetDocument.getURL($docAction, $escapetool.url({ 17 17 $fieldname: $lastAttachment.filename, 18 - 'comment': $comment, 19 19 'form_token': $request.form_token 20 20 }))) 21 21 #stop ... ... @@ -26,6 +26,7 @@ 26 26 ## 27 27 ## Macros 28 28 ## 25 +#set ($translationPrefix = 'xe.attachmentSelector') 29 29 #set ($attachmentPickerDocName = 'XWiki.AttachmentSelector') 30 30 31 31 $xwiki.ssx.use($attachmentPickerDocName) ... ... @@ -49,7 +49,7 @@ 49 49 #attachmentPicker_displayUploadForm($targetDocument, $targetAttachDocument, $options) 50 50 #end 51 51 #attachmentPicker_displayAttachmentGalleryEmptyValue($targetDocument, $targetAttachDocument, $options, $currentValue) 52 - #set ($sortedAttachments = $ collectiontool.sort($targetAttachDocument.getAttachmentList(), "${options.sortAttachmentsBy}") )49 + #set ($sortedAttachments = $sorttool.sort($targetAttachDocument.getAttachmentList(), "${options.sortAttachmentsBy}") ) 53 53 #foreach ($attachment in $sortedAttachments) 54 54 #set ($extension = $attachment.getFilename()) 55 55 #set ($extension = $extension.substring($mathtool.add($extension.lastIndexOf('.'), 1)).toLowerCase()) ... ... @@ -112,12 +112,12 @@ 112 112 #if ($attachment.isImage() && $options.displayImage) 113 113 ## We add the version to the query string in order to invalidate the cache when an image attachment is replaced. 114 114 #set ($queryString = $escapetool.url({'version': $attachment.version})) 115 - [[[[image:$ {attachmentStringReference}||width=180 queryString="$queryString"]]>>attach:$attachmentStringReference]]112 + [[[[image:$attachmentStringReference||width=180 queryString="$queryString"]]>>attach:$attachmentStringReference]] 116 116 #else 117 117 * (% class="mime" %){{html wiki=false clean=false}}#mimetypeimg($attachment.getMimeType().toLowerCase() $attachment.getFilename().toLowerCase()){{/html}}(%%) (% class="filename" %)$attachment.getFilename()(% %) 118 118 * v$attachment.getVersion() (#dynamicsize($attachment.longSize)) 119 119 * $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')}]) 120 - * (% class="buttonwrapper" %)[[${services.localization.render("${translationPrefix}.actions.download")}>>attach:$ {attachmentStringReference}||title="$services.localization.render("${translationPrefix}.actions.download")" rel="__blank" class="button"]](%%)117 + * (% class="buttonwrapper" %)[[${services.localization.render("${translationPrefix}.actions.download")}>>attach:$attachmentStringReference||title="$services.localization.render("${translationPrefix}.actions.download")" rel="__blank" class="button"]](%%) 121 121 #end 122 122 #end 123 123 #end ... ... @@ -285,7 +285,7 @@ 285 285 #end 286 286 #set ($options = { 287 287 'classname' : ${request.get('classname')}, 288 - 'object' : $!{ numbertool.toNumber($request.object).intValue()},285 + 'object' : $!{mathtool.toInteger($request.object)}, 289 289 'property' : ${request.property}, 290 290 'displayImage' : ${displayImage}, 291 291 'docAction' : ${docAction}, ... ... @@ -299,7 +299,7 @@ 299 299 #attachmentPicker_displayAttachmentGallery($targetDocument, $targetAttachDocument, $options) 300 300 301 301 (% class="gallery_buttons buttons" %)((( 302 - (% class="buttonwrapper secondary" %)[[$services.localization.render("${translationPrefix}.cancel")>>$ {targetDocument}||class="button secondary" id="attachment-picker-close"]]299 + (% class="buttonwrapper secondary" %)[[$services.localization.render("${translationPrefix}.cancel")>>$targetDocument||class="button secondary" id="attachment-picker-close"]] 303 303 ))) 304 304 #end 305 305 {{/velocity}}
- XWiki.JavaScriptExtension[0]
-
- Code
-
... ... @@ -173,7 +173,10 @@ 173 173 this.dialog.closeDialog(); 174 174 }.bindAsEventListener(this), 175 175 onFailure : function(response) { 176 - var failureReason = response.statusText || 'Server not responding'; 176 + var failureReason = response.statusText; 177 + if (response.statusText == '' /* No response */ || response.status == 12031 /* In IE */) { 178 + failureReason = 'Server not responding'; 179 + } 177 177 if (targetElement._x_notif) { 178 178 targetElement._x_notif.replace(new XWiki.widgets.Notification("$services.localization.render('core.widgets.confirmationBox.notification.failed')" + failureReason, "error")); 179 179 } else { ... ... @@ -180,6 +180,9 @@ 180 180 new XWiki.widgets.Notification(this.interactionParameters.failureMessageText + failureReason, "error"); 181 181 } 182 182 }, 186 + on1223 : function(response) { 187 + response.request.options.onSuccess(response); 188 + }, 183 183 on0 : function(response) { 184 184 response.request.options.onFailure(response); 185 185 },
- XWiki.StyleSheetExtension[0]
-
- Code
-
... ... @@ -140,6 +140,9 @@ 140 140 ## Make this box twice as large as the others 141 141 width: ${uploadBoxSize}px; 142 142 } 143 +* html .gallery_upload { 144 + width: ${mathtool.add($uploadBoxSize, 2)}px; 145 +} 143 143 .gallery_upload, .gallery_upload:hover { 144 144 background-color: $theme.backgroundSecondaryColor; 145 145 }
- XWiki.WikiMacroClass[0]
-
- Cached
-
... ... @@ -1,1 +1,0 @@ 1 -No - Asynchronous rendering
-
... ... @@ -1,1 +1,0 @@ 1 -No - Macro code
-
... ... @@ -3,6 +3,7 @@ 3 3 $xwiki.ssfx.use('js/xwiki/widgets/modalPopup.css', true)## 4 4 $xwiki.jsx.use($xcontext.macro.doc.fullName)## 5 5 $xwiki.ssx.use($xcontext.macro.doc.fullName)## 6 +$xwiki.jsfx.use('js/scriptaculous/builder.js')## 6 6 ## Integrates the optional Lightbox widget (from http://extensions.xwiki.org/xwiki/bin/view/Extension/Lightbox+Application ) 7 7 #if ($xwiki.exists('XWiki.Lightbox')) 8 8 $xwiki.jsx.use('XWiki.Lightbox') ... ... @@ -31,7 +31,7 @@ 31 31 #end 32 32 #set ($classname = "$!{xcontext.macro.params.classname}") 33 33 #set ($property = "$!{xcontext.macro.params.property}") 34 -#set ($object = $ numbertool.toNumber("$!{xcontext.macro.params.object}").intValue())35 +#set ($object = $mathtool.toInteger("$!{xcontext.macro.params.object}")) 35 35 #if ("$!{object}" != $!{xcontext.macro.params.object}) 36 36 #set ($object = ${doc.getObject($classname).number}) 37 37 #if ("$!{object}" == '') ... ... @@ -137,7 +137,7 @@ 137 137 #if ($hasTargetDoc) 138 138 #set ($queryString.targetdocname = $targetdoc.fullName) 139 139 #end 140 - (% class="buttonwrapper" %)[[$buttontext>>$ {xcontext.macro.doc.fullName}||queryString="$escapetool.url($queryString)"141 + (% class="buttonwrapper" %)[[$buttontext>>$xcontext.macro.doc.fullName||queryString="$escapetool.url($queryString)" 141 141 class="attachment-picker-start button" title="$buttontext"]](%%)## 142 142 #end 143 143 #end
- XWiki.WikiMacroParameterClass[0]
-
- Parameter type
-
... ... @@ -1,1 +1,0 @@ 1 -org.xwiki.model.reference.DocumentReference
- XWiki.WikiMacroParameterClass[10]
-
- Parameter type
-
... ... @@ -1,1 +1,0 @@ 1 -org.xwiki.model.reference.AttachmentReference
- XWiki.WikiMacroParameterClass[18]
-
- Parameter type
-
... ... @@ -1,1 +1,0 @@ 1 -org.xwiki.model.reference.DocumentReference