CRM-17915 - Fix datepicker in profiles

diff --git a/templates/CRM/Profile/Form/Dynamic.tpl b/templates/CRM/Profile/Form/Dynamic.tpl
index 3b74ad9ebe86ca66afd729d295de5466fa681b19..6b33985267295beadbe176f446a6e6428e55f5f0 100644 (file)
--- a/templates/CRM/Profile/Form/Dynamic.tpl
+++ b/templates/CRM/Profile/Form/Dynamic.tpl
@@ -171,8 +171,8 @@
                  {$form.$phone_ext_field.html}
                 {/if}
               {else}
-                {if ( $field.data_type eq 'Date' or
-                ( ( ( $n eq 'birth_date' ) or ( $n eq 'deceased_date' ) or ( $n eq 'activity_date_time' ) ) ) ) and $field.is_view neq 1 }
+                {if
+                ( ( $n eq 'birth_date' ) or ( $n eq 'deceased_date' ) or ( $n eq 'activity_date_time' ) ) and $field.is_view neq 1 }
                 {include file="CRM/common/jcalendar.tpl" elementName=$n}
                 {else}
                   {$form.$n.html}

diff --git a/templates/CRM/Profile/Form/Search.tpl b/templates/CRM/Profile/Form/Search.tpl
index cc1f6b69ae34ca3691e3f28fcde9319b0c8d0198..350b38e86e1ae402b104f6bfcc8431e4a7c8f0b9 100644 (file)
--- a/templates/CRM/Profile/Form/Search.tpl
+++ b/templates/CRM/Profile/Form/Search.tpl
@@ -44,18 +44,10 @@
       {if $field.is_search_range}
         {assign var=from value=$field.name|cat:'_from'}
         {assign var=to value=$field.name|cat:'_to'}
-        {if $field.data_type neq 'Date'}
           <tr>
             <td class="label">{$form.$from.label}</td>
             <td class="description">{$form.$from.html}&nbsp;&nbsp;{$form.$to.label}&nbsp;&nbsp;{$form.$to.html}</td>
           </tr>
-        {else}
-          <tr>
-            <td class="label">{$form.$from.label}</td>
-            <td class="description">{include file="CRM/common/jcalendar.tpl" elementName=$from}
-              &nbsp;&nbsp;{$form.$to.label}&nbsp;&nbsp;{include file="CRM/common/jcalendar.tpl" elementName=$to}</td>
-          </tr>
-        {/if}
       {else}
         <tr>
           <td class="label">
@@ -73,8 +65,7 @@
             </td>
           {else}
             <td class="description">
-              {if ( $field.data_type eq 'Date' or
-              ( ( ( $n eq 'birth_date' ) or ( $n eq 'deceased_date' ) ) ) ) }
+              {if ( $n eq 'birth_date' ) or ( $n eq 'deceased_date' ) }
                 {include file="CRM/common/jcalendar.tpl" elementName=$n}
               {elseif $n|substr:0:5 eq 'phone'}
                 {assign var="phone_ext_field" value=$n|replace:'phone':'phone_ext'}