CRM-14621 Fixed rendering of date fields on On Behalf of profiles
authorEdsel <edsel.lopez@jmaconsulting.biz>
Fri, 2 May 2014 11:16:40 +0000 (16:46 +0530)
committerEdsel <edsel.lopez@jmaconsulting.biz>
Fri, 2 May 2014 11:16:40 +0000 (16:46 +0530)
----------------------------------------
* CRM-14621: Date fields not being rendered properly on "On Behalf of" Profiles
  https://issues.civicrm.org/jira/browse/CRM-14621

CRM/Core/Page/AJAX/Location.php
templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl
templates/CRM/common/jcalendar.tpl

index d443faa93a3a40791d579ef5788df0e98a467b5c..b8dfb279cfe9e672b3ee0ea9375dd90fffcd3063 100644 (file)
@@ -203,6 +203,11 @@ class CRM_Core_Page_AJAX_Location {
               $elements["onbehalf_{$key}"]['value'] = $defaults[$key];
               $elements["onbehalf_{$key}"]['id'] = $defaults["{$key}_id"];
             }
+            elseif ($htmlType == 'Select Date') {
+              $elements["onbehalf_{$key}"]['type'] = $htmlType;
+              $elements["onbehalf_{$key}"]['value'] = $defaults[$key];
+              $elements["onbehalf_{$key}_display"]['value'] = $defaults[$key];
+            }
             else {
               $elements["onbehalf_{$key}"]['type'] = $htmlType;
               $elements["onbehalf_{$key}"]['value'] = $defaults[$key];
index 233ecdd5416241170e4226380dd2eb768c8c4bf2..fc7719021777996bbb1b72e228e8ad31ae613238 100644 (file)
               {if $form.onbehalf.$phone_ext_field.html}
                 &nbsp;{$form.onbehalf.$phone_ext_field.html}
               {/if}
+            {/if} 
+           {if $onBehalfOfFields.$fieldName.data_type eq 'Date'}
+            {assign var=elementName value=onbehalf[$fieldName]}
+              {include file="CRM/common/jcalendar.tpl" elementName=$elementName elementId=onbehalf_$fieldName}
             {/if}
             {if $onBehalfOfFields.$fieldName.help_post}
               <br /><span class='description'>{$onBehalfOfFields.$fieldName.help_post}</span>
index f092dc82578ba6c563e0a9bed795daf0d51e9029..b4e25f3d0dbd02e30298f4fdd47330ee1aa42daf 100644 (file)
@@ -43,7 +43,9 @@
       &nbsp;&nbsp;{$form.$blockSection.$blockId.$tElement.html|crmAddClass:six}
     {/if}
 {else}
-    {assign var='elementId'   value=$form.$elementName.id}
+    {if !$elementId}
+      {assign var='elementId'   value=$form.$elementName.id}
+    {/if}
     {assign var="timeElement" value=$elementName|cat:'_time'}
     {$form.$elementName.html}
 {/if}