Modifications pour le document FileUploader

Résumé

• Propriétés de la Page (2 modifications, 0 ajouts, 0 suppressions)

Détails

Propriétés de la Page

Auteur du document

...	...	@@ -1,1 +1,1 @@
1		-xwiki:XWiki.fcharton
	1	+XWiki.superadmin

Contenu

...	...	@@ -42,8 +42,6 @@
42	42	#set ($fileName = $xwiki.fileupload.getFileName('upload'))
43	43	#if ("$!fileName" != '')
44	44	#if ($services.csrf.isTokenValid($request.form_token))
45		- ## Note: This is not useful anymore and files are expected to have their definitive name on upload.
46		- ## Kept for legacy.
47	47	#if ($fileName.startsWith('__fileCreatedFromDataURI__.'))
48	48	## We need to generate a new name so that we don't overwrite existing attachments.
49	49	#set ($extension = $stringtool.substringAfter($fileName, '.'))
...	...	@@ -67,34 +67,11 @@
67	67	#set ($document = $xwiki.getDocument($request.document))
68	68	#end
69	69	#set ($reference = $document.documentReference)
70		- #try('uploadTemporaryAttachmentException')
71		- #if ("$!request.filename" != '')
72		- ## If the filename is explicitly provided, no need to recompute it.
73		- #set ($fileName = $request.filename)
74		- #else
75		- #set ($fileName = $request.getPart('upload').getSubmittedFileName())
76		- ## Note: this is not useful anymore and files are expected to have their definitive name on upload.
77		- ## Kept for legacy.
78		- #if ($fileName.startsWith('__fileCreatedFromDataURI__.'))
79		- ## We need to generate a new name so that we don't overwrite existing attachments.
80		- #set ($extension = $stringtool.substringAfter($fileName, '.'))
81		- #set ($fileName = "${datetool.date.time}-${mathtool.random(100, 1000)}.$extension")
82		- #end
83		- #end
84		- #set ($attachment = $services.temporaryAttachments.uploadTemporaryAttachment($reference, 'upload', $fileName))
85		- #end
	68	+ #set ($attachment = $services.temporaryAttachments.uploadTemporaryAttachment($reference, 'upload'))
86	86	#if ($attachment)
87	87	#sendSuccess($document, $attachment.filename)
88		- #elseif ("$!uploadTemporaryAttachmentException" != '')
89		- ## The exception is wrapped in an org.apache.velocity.exception.MethodInvocationException
90		- #set ($validationException = $uploadTemporaryAttachmentException.cause)
91		- #if ($validationException.translationKey)
92		- #sendError(400 "$services.localization.render($validationException.translationKey, $validationException.translationParameters)")
93		- #else
94		- #sendError(400 "$services.localization.render('ckeditor.upload.error.emptyReturn')")
95		- #end
96	96	#else
97		- #sendError(400 "$services.localization.render('ckeditor.upload.error.emptyReturn')")
	72	+ #sendError(400 "$services.localization.render('ckeditor.upload.error.emptyreturn')")
98	98	#end
99	99	#else
100	100	#sendError(403 "$services.localization.render('ckeditor.upload.error.csrf')")
...	...	@@ -147,24 +147,10 @@
147	147
148	148	{{velocity wiki="false"}}
149	149	#if ($xcontext.action == 'get')
150		- ## We fallback on the old mechanism also in case of editing a translation to avoid any problem.
151		- ## See: XWIKI-20034
152		- #set ($document = $tdoc)
153		- #if ("$!request.document" != '')
154		- #set ($document = $xwiki.getDocument($request.document))
155		- #end
156		- ## Special handling if we're editing a translation that does not exist yet: in such case we cannot rely on $document.isTranslation because the context $tdoc
157		- ## automatically fallback on the default locale in view mode, and we're getting this through a /get/ request.
158		- ## See: XWIKI-20537
159		- #set ($isNewTranslation = false)
160		- #if ($document.locale == "" && $services.localization.currentLocale != $services.localization.defaultLocale)
161		- #set ($docRefWithLocale = $services.model.createDocumentReference($document.documentReference, $services.localization.currentLocale))
162		- #set ($isNewTranslation = $xwiki.getDocument($docRefWithLocale).isNew())
163		- #end
164		- #if ($request.getHeader('X-XWiki-Temporary-Attachment-Support') == 'true' && !$document.isTranslation() && !$isNewTranslation)
165		- #handleTemporaryUploadRequest()
	125	+ #if ($request.getHeader('X-XWiki-Temporary-Attachment-Support') == 'true')
	126	+ #handleTemporaryUploadRequest
166	166	#else
167		- #handleUploadRequest()
	128	+ #handleUploadRequest
168	168	#end
169	169	#end
170	170	{{/velocity}}