Added Markup output

CRM/DataprocessorSearch/Form/AbstractSearch.php

@@ -4,6 +4,8 @@
  * @license AGPL-3.0
  */
 
+use Civi\DataProcessor\FieldOutputHandler\FieldOutput;
+use Civi\DataProcessor\FieldOutputHandler\Markupable;
 use CRM_Dataprocessor_ExtensionUtil as E;
 
 abstract class CRM_DataprocessorSearch_Form_AbstractSearch extends CRM_Dataprocessor_Form_Output_AbstractUIOutputForm {
@@ -252,7 +254,14 @@ abstract class CRM_DataprocessorSearch_Form_AbstractSearch extends CRM_Dataproce
           $row['id'] = $record[$id_field]->rawValue;
         }
         $row['checkbox'] = CRM_Core_Form::CB_PREFIX.$row['id'];
-        $row['record'] = $record;
+        $row['record'] = array();
+        foreach($record as $column => $value) {
+          if ($value instanceof Markupable) {
+            $row['record'][$column] = $value->getMarkupOut();
+          } elseif ($value instanceof FieldOutput) {
+            $row['record'][$column] = $value->formattedValue;
+          }
+        }
 
         $link = $this->link($row);
         if ($link) {
@@ -441,4 +450,4 @@ abstract class CRM_DataprocessorSearch_Form_AbstractSearch extends CRM_Dataproce
     return $this->dataProcessorOutput['configuration']['title'];
   }
 
-}
+}
\ No newline at end of file

Civi/DataProcessor/FieldOutputHandler/ContactLinkFieldOutputHandler.php

@@ -132,8 +132,9 @@ class ContactLinkFieldOutputHandler extends AbstractFieldOutputHandler implement
       'cid' => $contactId,
     ));
     $link = '<a href="'.$url.'">'.$contactname.'</a>';
-    $formattedValue = new FieldOutput($contactId);
-    $formattedValue->formattedValue = $link;
+    $formattedValue = new HTMLFieldOutput($contactId);
+    $formattedValue->formattedValue = $contactname;
+    $formattedValue->setHtmlOutput($link);
     return $formattedValue;
   }
 
@@ -209,4 +210,4 @@ class ContactLinkFieldOutputHandler extends AbstractFieldOutputHandler implement
 
 
 
-}
+}
\ No newline at end of file

Civi/DataProcessor/FieldOutputHandler/HTMLFieldOutput.php

+<?php
+/**
+ * @author Jaap Jansma <jaap.jansma@civicoop.org>
+ * @license AGPL-3.0
+ */
+
+namespace Civi\DataProcessor\FieldOutputHandler;
+
+class HTMLFieldOutput extends FieldOutput implements Markupable {
+
+  protected $html;
+
+  /**
+   * Sets the HTML value
+   *
+   * @param $html
+   */
+  public function setHtmlOutput($html) {
+    $this->html = $html;
+  }
+
+  /**
+   * Return the output as markup.
+   *
+   * @return String
+   */
+  public function getMarkupOut() {
+    if ($this->html) {
+      return $this->html;
+    }
+    return $this->formattedValue;
+  }
+
+}

Civi/DataProcessor/FieldOutputHandler/Markupable.php

+<?php
+/**
+ * @author Jaap Jansma <jaap.jansma@civicoop.org>
+ * @license AGPL-3.0
+ */
+
+namespace Civi\DataProcessor\FieldOutputHandler;
+
+interface Markupable {
+
+  /**
+   * Return the output as markup.
+   *
+   * @return String
+   */
+  public function getMarkupOut();
+
+}

templates/CRM/Contact/Form/DataProcessorContactSearch.tpl

@@ -49,7 +49,7 @@
                             <td>{$row.contact_type}</td>
                             {foreach from=$columnHeaders key=headerName item=headerTitle}
                                 {assign var=columnValue value=$record.$headerName}
-                                <td>{$columnValue->formattedValue}</td>
+                                <td>{$columnValue}</td>
                             {/foreach}
 
                             <td>
@@ -70,4 +70,4 @@
     </div>
 
     {include file="CRM/DataprocessorSearch/Form/ResultsJavascript.tpl"}
-{/if}
+{/if}
\ No newline at end of file

templates/CRM/DataprocessorSearch/Form/Search.tpl

@@ -51,7 +51,7 @@
                             <td>{$form.$cbName.html}</td>
                             {foreach from=$columnHeaders key=headerName item=headerTitle}
                                 {assign var=columnValue value=$record.$headerName}
-                                <td>{$columnValue->formattedValue}</td>
+                                <td>{$columnValue}</td>
                             {/foreach}
 
                             <td>
@@ -72,4 +72,4 @@
     </div>
 
     {include file="CRM/DataprocessorSearch/Form/ResultsJavascript.tpl"}
-{/if}
+{/if}
\ No newline at end of file