Merge pull request #2308 from civicrm/4.4

[civicrm-core.git] / templates / CRM / Contact / Form / NewContact.tpl

diff --git a/templates/CRM/Contact/Form/NewContact.tpl b/templates/CRM/Contact/Form/NewContact.tpl
index 762f33c42da70c7e01b12c57b6d00d40691cd784..41d5f35b33c597d5f01b876ceb440b884826931a 100644 (file)
--- a/templates/CRM/Contact/Form/NewContact.tpl
+++ b/templates/CRM/Contact/Form/NewContact.tpl
@@ -1,6 +1,6 @@
 {*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.3                                                |
+ | CiviCRM version 4.4                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2013                                |
  +--------------------------------------------------------------------+
@@ -24,7 +24,7 @@
  +--------------------------------------------------------------------+
 *}
 {* template for adding form elements for selecting existing or creating new contact*}
-{if !in_array($context, array('search','advanced', 'builder')) }
+{if !in_array($context, array('search','advanced', 'builder')) || $parent eq 'activity'}
   {assign var='fldName' value=$prefix|cat:'contact'}
   {assign var='profSelect' value=$prefix|cat:'profiles'}
 
@@ -37,7 +37,7 @@
         {/if}
       {else}
         {$form.$fldName.$blockNo.html}
-        {if $form.$profSelect}
+        {if $form.$profSelect and $showNewSelect}
           &nbsp;&nbsp;{ts}OR{/ts}&nbsp;&nbsp;{$form.$profSelect.$blockNo.html}<div id="contact-dialog-{$prefix}{$blockNo}" class="hiddenElement"></div>
         {/if}
       {/if}
@@ -56,7 +56,13 @@
 {literal}
 <script type="text/javascript">
   var allowMultiClient = Boolean({/literal}{if !empty($multiClient)}1{else}0{/if}{literal});
-  var prePopulateData = {/literal}{$prePopulateData}{literal};
+
+  {/literal}
+  var prePopulateData = '';
+  {if $prePopulateData}
+      prePopulateData = {$prePopulateData};
+  {/if}
+  {literal}
 
   var existingTokens = '';
   cj( function( ) {
@@ -106,7 +112,10 @@
     // setdefaults incase of formRule
     {/literal}
     {if $selectedContacts}
-      {literal} var prePopulateData = cj.ajax({ url: contactUrl + "&cid={/literal}{$selectedContacts}{literal}", async: false }).responseText;{/literal}
+      {literal}
+        var prePopulateData = cj.ajax({ url: contactUrl + "&cid={/literal}{$selectedContacts}{literal}", async: false }).responseText;
+        prePopulateData = cj.parseJSON(prePopulateData);
+      {/literal}
     {/if}
     {literal}