Clean up scheduled jobs

diff --git a/CRM/Admin/Page/Job.php b/CRM/Admin/Page/Job.php
index 80ba5524ab759915ccee2f95dfab390e5ba0ecbf..72d9d3eed8acac51d1edf90e3912390282353158 100644 (file)
--- a/CRM/Admin/Page/Job.php
+++ b/CRM/Admin/Page/Job.php
@@ -52,18 +52,18 @@ class CRM_Admin_Page_Job extends CRM_Core_Page_Basic {
           'qs' => 'jid=%%id%%&reset=1',
           'title' => ts('See log entries for this Scheduled Job'),
         ],
+        CRM_Core_Action::VIEW => [
+          'name' => ts('Execute'),
+          'url' => 'civicrm/admin/job/edit',
+          'qs' => 'action=view&id=%%id%%&reset=1',
+          'title' => ts('Execute Scheduled Job Now'),
+        ],
         CRM_Core_Action::UPDATE => [
           'name' => ts('Edit'),
           'url' => 'civicrm/admin/job/edit',
           'qs' => 'action=update&id=%%id%%&reset=1',
           'title' => ts('Edit Scheduled Job'),
         ],
-        CRM_Core_Action::VIEW => [
-          'name' => ts('Execute Now'),
-          'url' => 'civicrm/admin/job/edit',
-          'qs' => 'action=view&id=%%id%%&reset=1',
-          'title' => ts('Execute Scheduled Job Now'),
-        ],
         CRM_Core_Action::DISABLE => [
           'name' => ts('Disable'),
           'ref' => 'crm-enable-disable',

diff --git a/templates/CRM/Admin/Page/Job.tpl b/templates/CRM/Admin/Page/Job.tpl
index 57d54e66924c7276de6c9e1346e4fd41406a99b2..0030cffa10c0ab2b9cebc515d1fe2539aa5c5b09 100644 (file)
--- a/templates/CRM/Admin/Page/Job.tpl
+++ b/templates/CRM/Admin/Page/Job.tpl
@@ -42,11 +42,11 @@
         {foreach from=$rows item=row}
         <tr id="job-{$row.id}" class="crm-entity {cycle values="odd-row,even-row"} {$row.class}{if NOT $row.is_active} disabled{/if}">
             <td class="crm-job-name"><strong><span data-field="name">{$row.name}</span></strong> ({$row.run_frequency})<br/>
-                {$row.description}<br />
+                {if array_key_exists('description', $row)}{$row.description}{/if}<br />
                 {ts}API Entity:{/ts} {$row.api_entity}<br/>
                 {ts}API Action:{/ts} <strong>{$row.api_action}</strong><br/>
             </td>
-            <td class="crm-job-name">{if $row.parameters eq null}<em>{ts}no parameters{/ts}</em>{else}<pre>{$row.parameters}</pre>{/if}</td>
+            <td class="crm-job-name">{if $row.parameters eq null}<em>{ts}no parameters{/ts}</em>{else}{$row.parameters|nl2br}{/if}</td>
             <td class="crm-job-name">{if $row.last_run eq null}never{else}{$row.last_run|crmDate:$config->dateformatDatetime}{/if}</td>
             <td id="row_{$row.id}_status" class="crm-job-is_active">{if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
           <td>{$row.action|smarty:nodefaults|replace:'xx':$row.id}</td>