Изменения документа Delete Application

Сводка

• Свойства страницы (2 изменено, 0 добавлено, 0 удалено)

Подробности

Свойства страницы

Автор документа

...	...	@@ -1,1 +1,1 @@
1		-XWiki.admin
	1	+XWiki.rybakovds

Содержимое

...	...	@@ -26,12 +26,12 @@
26	26	#end
27	27
28	28	#macro (bulkDelete $entities)
29		- #set ($errors = [])
	29	+ #set ($errorLog = $NULL)
30	30	#set ($deleteJob = $services.refactoring.delete($entities))
31	31	#try()
32	32	#set ($discard = $deleteJob.join())
33	33	#set ($deleteJobStatus = $services.job.getJobStatus($deleteJob.request.id))
34		- #set ($errors = $deleteJobStatus.log.getLogs('ERROR'))
	34	+ #set ($errorLog = $deleteJobStatus.logTail.getFirstLogEvent('ERROR'))
35	35	#end
36	36	#end
37	37
...	...	@@ -54,8 +54,9 @@
54	54	'form_token': $services.csrf.token
55	55	})
56	56	#if ("$!request.xredirect" != '')
57		- #set ($cancelURL = $request.xredirect)
58		- #set ($confirmParams.xredirect = $cancelURL)
	57	+ #getSanitizedURLAttributeValue('a','href',$request.xredirect,$doc.getURL(),$cancelURL)
	58	+ ## We don't sanitize those parameters as the sanitation will be handled server side.
	59	+ #set ($confirmParams.xredirect = $request.xredirect)
59	59	#end
60	60	#set ($confirmURL = $doc.getURL($xcontext.action, $escapetool.url($confirmParams)))
61	61	{{html}}
...	...	@@ -96,8 +96,8 @@
96	96	#end
97	97	#bulkDelete($pageReferences)
98	98	##
99		- #if ($errors.size() > 0)
100		- {{error}}$errors.get(0){{/error}}
	100	+ #if ($errorLog)
	101	+ {{error}}$errorLog{{/error}}
101	101	#elseif ($request.xredirect)
102	102	## If requested, redirect the UI after the work is complete.
103	103	$response.sendRedirect($request.xredirect)