Merge pull request #31134 from civicrm/5.78

5.78 to master

CRM/Contribute/Import/Form/MapField.php

@@ -189,7 +189,7 @@ class CRM_Contribute_Import_Form_MapField extends CRM_Import_Form_MapField {
     foreach ($this->getColumnHeaders() as $i => $columnHeader) {
       $defaults["mapper[$i]"] = [];
       if ($this->getSubmittedValue('savedMapping')) {
-        $fieldMapping = $fieldMappings[$i] ?? NULL;
+        $fieldMapping = $fieldMappings[$i] ?? [];
         $this->addMappingToDefaults($defaults, $fieldMapping, $i);
       }
       elseif ($this->getSubmittedValue('skipColumnHeader')) {

CRM/Upgrade/Incremental/php/FiveSeventyEight.php

@@ -52,4 +52,14 @@ class CRM_Upgrade_Incremental_php_FiveSeventyEight extends CRM_Upgrade_Increment
     }
   }
 
+  /**
+   * Upgrade step; adds tasks including 'runSql'.
+   *
+   * @param string $rev
+   *   The version number matching this function name
+   */
+  public function upgrade_5_78_beta1($rev): void {
+    $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
+  }
+
 }

CRM/Upgrade/Incremental/sql/5.78.beta1.mysql.tpl

+UPDATE `civicrm_job_log` jl
+  LEFT JOIN `civicrm_job` j ON j.id = jl.job_id
+  SET jl.`run_time` = COALESCE(j.`last_run_end`, j.`last_run`, current_timestamp())
+  WHERE jl.`run_time` IS NULL;
+ALTER TABLE `civicrm_job_log` MODIFY COLUMN `run_time` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() COMMENT 'Log entry date';

schema/Core/JobLog.entityType.php

@@ -47,6 +47,8 @@ return [
       'sql_type' => 'timestamp',
       'input_type' => NULL,
       'description' => ts('Log entry date'),
+      'required' => TRUE,
+      'default' => 'CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP',
       'add' => '4.1',
     ],
     'job_id' => [

templates/CRM/Custom/Form/Search.tpl

@@ -36,7 +36,7 @@
                     {include file="CRM/Core/DatePickerRangeCustomField.tpl" fieldName=$element_name to='' from='' colspan='' class='' hideRelativeLabel=0}<td>
                   {/if}
             {else}
-              <td class="label">{if array_key_exists($element_name, $form)}{$form.$element_name.label}{/if})</td><td>
+              <td class="label">{if array_key_exists($element_name, $form)}{$form.$element_name.label}{/if}</td><td>
                 {if array_key_exists($element_name, $form)}{$form.$element_name.html}{/if}
                 {if !empty($form.$operator_name)}
                   <span class="crm-multivalue-search-op" for="{$element_name}">{$form.$operator_name.html}</span>