From f2dc84fb420d8d81a5ce8d6547650b42ea6498c3 Mon Sep 17 00:00:00 2001
From: Jaap Jansma <jaap.jansma@civicoop.org>
Date: Fri, 15 Mar 2019 09:27:25 +0100
Subject: [PATCH] update minor fixes
---
CRM/Dataprocessor/Form/Output/Search.php | 3 ++-
CRM/DataprocessorSearch/Form/Search.php | 1 -
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/CRM/Dataprocessor/Form/Output/Search.php b/CRM/Dataprocessor/Form/Output/Search.php
index 59601f15..84de9973 100644
--- a/CRM/Dataprocessor/Form/Output/Search.php
+++ b/CRM/Dataprocessor/Form/Output/Search.php
@@ -24,7 +24,8 @@ class CRM_Dataprocessor_Form_Output_Search extends CRM_Dataprocessor_Form_Output
$dataProcessor = CRM_Dataprocessor_BAO_DataProcessor::getDataProcessorById($this->dataProcessorId);
$fields = array();
- foreach($dataProcessor->getDataFlow()->getDataSpecification()->getFields() as $field) {
+ foreach($dataProcessor->getDataFlow()->getOutputFieldHandlers() as $outputFieldHandler) {
+ $field = $outputFieldHandler->getOutputFieldSpecification();
$fields[$field->alias] = $field->title;
}
diff --git a/CRM/DataprocessorSearch/Form/Search.php b/CRM/DataprocessorSearch/Form/Search.php
index 6e900f31..606c53b1 100644
--- a/CRM/DataprocessorSearch/Form/Search.php
+++ b/CRM/DataprocessorSearch/Form/Search.php
@@ -109,7 +109,6 @@ class CRM_DataprocessorSearch_Form_Search extends CRM_Core_Form_Search {
$this->dataProcessor->getDataFlow()->setOffset($offset);
// Set the sort
- $sortField = '';
$sortDirection = 'ASC';
if (!empty($this->sort->_vars[$this->sort->getCurrentSortID()])) {
$sortField = $this->sort->_vars[$this->sort->getCurrentSortID()];
--
GitLab