Modifications pour le document Planificateur de traitements
Modifié par john le 2026/06/02 12:24
Résumé
-
Propriétés de la Page (1 modifications, 0 ajouts, 0 suppressions)
Détails
- Propriétés de la Page
-
- Contenu
-
... ... @@ -2,12 +2,11 @@ 2 2 ## First, set a shortcut to our Scheduler plugin 3 3 ## 4 4 #set ($scheduler = $xwiki.scheduler) 5 -#set ($schedulerEnabled = $scheduler.enabled) 6 6 ## 7 7 ## If the sheet is called with an action ($request.do), let us first process this action 8 8 ## Possible values are : "schedule", "pause", "resume", "unschedule", "delete" 9 9 ## 10 -#if ( $schedulerEnabled &&"$!request.do" != '' && "$!request.which" != '')9 +#if ("$!request.do" != '' && "$!request.which" != '') 11 11 ## 12 12 ## Obtain the Job document and object for which the action has been called 13 13 ## ... ... @@ -26,7 +26,7 @@ 26 26 ## 27 27 #set ($ok = $scheduler.scheduleJob($jobObj)) 28 28 #if (!$ok) 29 - {{error}}$ services.rendering.escape($xcontext.get('error'), 'xwiki/2.1'){{/error}}28 + {{error}}$xcontext.get('error'){{/error}} 30 30 31 31 #else 32 32 #set ($jobName = "$jobObj.get('jobName')") ... ... @@ -39,7 +39,7 @@ 39 39 ## 40 40 #set ($ok = $scheduler.pauseJob($jobObj)) 41 41 #if (!$ok) 42 - {{error}}$ services.rendering.escape($xcontext.get('error'), 'xwiki/2.1'){{/error}}41 + {{error}}$xcontext.get('error'){{/error}} 43 43 44 44 #else 45 45 {{info}}$services.localization.render('xe.scheduler.paused', [$jobObj.get('jobName')]){{/info}} ... ... @@ -51,7 +51,7 @@ 51 51 ## 52 52 #set ($ok = $scheduler.resumeJob($jobObj)) 53 53 #if (!$ok) 54 - {{error}}$ services.rendering.escape($xcontext.get('error'), 'xwiki/2.1'){{/error}}53 + {{error}}$xcontext.get('error'){{/error}} 55 55 56 56 #else 57 57 {{info}}$services.localization.render('xe.scheduler.resumed', [$jobObj.get('jobName'), $scheduler.getNextFireTime($jobObj)]){{/info}} ... ... @@ -63,7 +63,7 @@ 63 63 ## 64 64 #set ($ok = $scheduler.unscheduleJob($jobObj)) 65 65 #if (!$ok) 66 - {{error}}$ services.rendering.escape($xcontext.get('error'), 'xwiki/2.1'){{/error}}65 + {{error}}$xcontext.get('error'){{/error}} 67 67 68 68 #else 69 69 {{info}}$services.localization.render('xe.scheduler.unscheduled', [$jobObj.get('jobName')]){{/info}} ... ... @@ -81,7 +81,7 @@ 81 81 #set ($deleteRedirect = $xwiki.getURL($jobObj.getName(), 'delete')) 82 82 $response.sendRedirect($deleteRedirect) 83 83 #else 84 - {{error}}$ services.rendering.escape($xcontext.get('error'), 'xwiki/2.1'){{/error}}83 + {{error}}$xcontext.get('error'){{/error}} 85 85 86 86 #end 87 87 #else ... ... @@ -94,7 +94,7 @@ 94 94 ## 95 95 #set ($ok = $scheduler.triggerJob($jobObj)) 96 96 #if (!$ok) 97 - {{error}}$ services.rendering.escape($xcontext.get('error'), 'xwiki/2.1'){{/error}}96 + {{error}}$xcontext.get('error'){{/error}} 98 98 99 99 #else 100 100 {{info}}$services.localization.render('xe.scheduler.triggered', [$jobObj.get('jobName')]){{/info}} ... ... @@ -104,12 +104,6 @@ 104 104 #end 105 105 $services.localization.render('xe.scheduler.welcome') 106 106 107 -#if (!$schedulerEnabled) 108 -{{warning}} 109 - {{translation key="scheduler.disabled"/}} 110 -{{/warning}} 111 - 112 -#end 113 113 = $services.localization.render('xe.scheduler.jobs.list') = 114 114 115 115 ## ... ... @@ -116,35 +116,32 @@ 116 116 ## Retrieve all scheduler jobs 117 117 ## Display their name, status, possible next fire time, and available actions 118 118 ## 119 -|=(%scope="col"%)$services.localization.render('xe.scheduler.jobs.name') #if ($schedulerEnabled)|=(%scope="col"%)$services.localization.render('xe.scheduler.jobs.status')|=(%scope="col"%)$services.localization.render('xe.scheduler.jobs.next')#end|=(%scope="col"%)$services.localization.render('xe.scheduler.jobs.actions')112 +|=(%scope="col"%)$services.localization.render('xe.scheduler.jobs.name')|=(%scope="col"%)$services.localization.render('xe.scheduler.jobs.status')|=(%scope="col"%)$services.localization.render('xe.scheduler.jobs.next')|=(%scope="col"%)$services.localization.render('xe.scheduler.jobs.actions') 120 120 #foreach ($docName in $services.query.xwql('from doc.object(XWiki.SchedulerJobClass) as jobs where doc.fullName <> ''XWiki.SchedulerJobTemplate''').execute()) 121 121 #set ($jobHolder = $xwiki.getDocument($docName)) 122 122 #set ($job = $jobHolder.getObject('XWiki.SchedulerJobClass')) 123 - #if ($schedulerEnabled) 124 - #set ($status = $scheduler.getJobStatus($job).value) 125 - #if ($status == '') 126 - #set ($status = 'None') 127 - #end 128 - #set ($firetime = '') 129 - #if ($status != 'None') 130 - #set ($firetime = $scheduler.getNextFireTime($job)) 131 - #else 132 - #set ($firetime = $services.localization.render('xe.scheduler.jobs.next.undefined')) 133 - #end 134 - #set ($actions = ['trigger']) 135 - #if ($status == 'None') 136 - #set ($ok = $actions.add('schedule')) 137 - #elseif($status == 'Normal') 138 - #set ($ok = $actions.addAll(['pause', 'unschedule'])) 139 - #elseif ($status == 'Paused') 140 - #set ($ok = $actions.addAll(['resume', 'unschedule'])) 141 - #end 142 - #set ($ok = $actions.add('delete')) 116 + #set ($status = $scheduler.getJobStatus($job).value) 117 + #if ($status == '') 118 + #set ($status = 'None') 143 143 #end 144 -|$job.get('jobName')#if($schedulerEnabled)|$status|$firetime#end|**$services.localization.render('xe.scheduler.jobs.actions.access')** [[$services.localization.render('xe.scheduler.jobs.actions.view')>>$services.rendering.escape($jobHolder.fullName, 'xwiki/2.1')]]#if($jobHolder.hasAccessLevel('programming'))#if ($schedulerEnabled) [[$services.localization.render('xe.scheduler.jobs.actions.edit')>>path:${jobHolder.getURL('edit')}]]#end#end#if ($schedulerEnabled) **$services.localization.render('xe.scheduler.jobs.actions.manage')**#foreach($action in $actions) [[$services.localization.render("xe.scheduler.jobs.actions.$action")>>path:$doc.getURL('view', $escapetool.url({'do': $action, 'which': $jobHolder.fullName, 'form_token': $services.csrf.token}))]]#end#end 120 + #set ($firetime = '') 121 + #if ($status != 'None') 122 + #set ($firetime = $scheduler.getNextFireTime($job)) 123 + #else 124 + #set ($firetime = $services.localization.render('xe.scheduler.jobs.next.undefined')) 125 + #end 126 + #set ($actions = ['trigger']) 127 + #if ($status == 'None') 128 + #set ($ok = $actions.add('schedule')) 129 + #elseif($status == 'Normal') 130 + #set ($ok = $actions.addAll(['pause', 'unschedule'])) 131 + #elseif ($status == 'Paused') 132 + #set ($ok = $actions.addAll(['resume', 'unschedule'])) 133 + #end 134 + #set ($ok = $actions.add('delete')) 135 +|$job.get('jobName')|$status|$firetime|**$services.localization.render('xe.scheduler.jobs.actions.access')** [[$services.localization.render('xe.scheduler.jobs.actions.view')>>$services.rendering.escape($jobHolder.fullName, 'xwiki/2.1')]]#if($jobHolder.hasAccessLevel('programming')) [[$services.localization.render('xe.scheduler.jobs.actions.edit')>>path:${jobHolder.getURL('edit')}]]#end **$services.localization.render('xe.scheduler.jobs.actions.manage')**#foreach($action in $actions) [[$services.localization.render("xe.scheduler.jobs.actions.$action")>>path:$doc.getURL('view', $escapetool.url({'do': $action, 'which': $jobHolder.fullName, 'form_token': $services.csrf.token}))]]#end 145 145 146 146 #end 147 -#if ($schedulerEnabled) 148 148 #if ($doc.hasAccessLevel('programming')) 149 149 ## 150 150 ## Job creation is offered only for programmers, because the job page needs to be saved ... ... @@ -182,5 +182,4 @@ 182 182 {{warning}}$services.localization.render('xe.scheduler.jobs.warning'){{/warning}} 183 183 184 184 #end 185 -#end 186 186 {{/velocity}}