date filter fix

CRM/Dataprocessor/Form/FilterValue.php

@@ -55,7 +55,6 @@ class CRM_Dataprocessor_Form_FilterValue extends CRM_Core_Form {
 
 
     $this->filter = civicrm_api3('DataProcessorFilter', 'getsingle', array('id' => $this->id));
-    $this->assign('filter', $this->filter);
     $this->filterTypeClass = $factory->getFilterByName($this->filter['type']);
     $this->filterTypeClass->setDataProcessor($this->dataProcessorClass);
     $this->filterTypeClass->initialize($this->filter);
@@ -68,7 +67,8 @@ class CRM_Dataprocessor_Form_FilterValue extends CRM_Core_Form {
     $this->add('hidden', 'data_processor_id');
     $this->add('hidden', 'id');
 
-    $this->filterTypeClass->addToFilterForm($this, $this->filter['filter_value']);
+    $filter = $this->filterTypeClass->addToFilterForm($this, $this->filter['filter_value']);
+    $this->assign('filter', $filter);
     $this->assign('filter_template', $this->filterTypeClass->getTemplateFileName());
 
     $this->addButtons(array(

Civi/DataProcessor/FilterHandler/AbstractFilterHandler.php

@@ -480,6 +480,7 @@ abstract class AbstractFilterHandler {
     }
 
     $filter['type'] = $fieldSpec->type;
+    $filter['alias'] = $fieldSpec->alias;
     $filter['title'] = $title;
 
 

templates/CRM/Dataprocessor/Form/Filter/GenericFilter.tpl

-{assign var=fieldOp     value=$filterName|cat:"_op"}
-{assign var=filterVal   value=$filterName|cat:"_value"}
-{assign var=filterMin   value=$filterName|cat:"_min"}
-{assign var=filterMax   value=$filterName|cat:"_max"}
+{assign var=fieldOp     value=$filter.alias|cat:"_op"}
+{assign var=filterVal   value=$filter.alias|cat:"_value"}
+{assign var=filterMin   value=$filter.alias|cat:"_min"}
+{assign var=filterMax   value=$filter.alias|cat:"_max"}
 
 {if $filter.type == 'Date' || $filter.type == 'Timestamp'}
     <tr>
         <td class="label">{$filter.title}</td>
-        {include file="CRM/Dataprocessor/Form/Filter/DateRange.tpl" fieldName=$filterName from='_from' to='_to'}
+        {$filterName}
+        {include file="CRM/Dataprocessor/Form/Filter/DateRange.tpl" fieldName=$filter.alias from='_from' to='_to'}
     </tr>
 {elseif $form.$fieldOp.html}
     <tr>

templates/CRM/Dataprocessor/Form/Output/UIOutput/CriteriaForm.tpl

@@ -13,7 +13,7 @@
                         <th>{ts}Value{/ts}</th>
                     </tr>
                     {foreach from=$filters key=filterName item=filter}
-                        {include file=$filter.template filterName=$filterName filter=$filter.filter}
+                        {include file=$filter.template filter=$filter.filter}
                     {/foreach}
                 </table>
                 <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="botton"}</div>