| ... |
... |
@@ -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}} |